merge of '2ca01af51f12b07b28c6a80e57347d82f7122780'
authorKoen Kooi <koen@openembedded.org>
Sat, 5 Aug 2006 19:50:54 +0000 (19:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 5 Aug 2006 19:50:54 +0000 (19:50 +0000)
     and '7f3bc3b8600afa9c810238b8d5a88ec7a80c6c9a'


Trivial merge