merge of '13364d2be993b3a7913d2159c9b8514e52893b4a'
authorKoen Kooi <koen@openembedded.org>
Sat, 7 Apr 2007 20:50:28 +0000 (20:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 7 Apr 2007 20:50:28 +0000 (20:50 +0000)
     and '185ce7e23b283d430a101c7e4df3f38562a67271'


Trivial merge