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)
     and '75c7809d53aac42fe9ec7942504b4d2b1a89081d'


Trivial merge