merge of '611bfe4d6e620cea4d216e318144b7394bd7d322'
authorKoen Kooi <koen@openembedded.org>
Mon, 6 Aug 2007 12:08:02 +0000 (12:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 6 Aug 2007 12:08:02 +0000 (12:08 +0000)
commitfb287568516bde979215aa9860b92fd8e93e1ae4
treee90de08fb245e50c2ed7e3a78c705d8d04e046b6
parent50c18df5bec2aabd3ddcb8ea2219c3e170e3bb8e
parent43298cfac57ec70d3184147b1e2639511cba3103
Merge ... '611bfe4d6e620cea4d216e318144b7394bd7d322'
     and '75c7809d53aac42fe9ec7942504b4d2b1a89081d'