merge of 'd70f986456dbed534668139d7aff0d7ddbd4d10e'
authorKoen Kooi <koen@openembedded.org>
Wed, 4 Oct 2006 13:26:53 +0000 (13:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 4 Oct 2006 13:26:53 +0000 (13:26 +0000)
     and 'e0c1d149111b1270a0ae00ae100635a5a0be3051'


Trivial merge