merge of '02a6624c71727e9ca8fc9cb4497b838837b84379'
authorKoen Kooi <koen@openembedded.org>
Wed, 21 Mar 2007 11:38:35 +0000 (11:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 21 Mar 2007 11:38:35 +0000 (11:38 +0000)
     and 'fef7c2b78ae5793c1c732ea85c614ee80e04b0e1'


Trivial merge