merge of '038bc21b349c21561050092a7a6d68a019b921e1'
authorKoen Kooi <koen@openembedded.org>
Thu, 26 Apr 2007 16:54:16 +0000 (16:54 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 26 Apr 2007 16:54:16 +0000 (16:54 +0000)
     and '72018d16d4bf3617a2f7efda54bde7f5b784e01a'


Trivial merge