merge of '4d6ee85cc3ba867945ab4763b494533e79d9e0ac'
authorKoen Kooi <koen@openembedded.org>
Wed, 30 Jul 2008 15:15:43 +0000 (15:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 30 Jul 2008 15:15:43 +0000 (15:15 +0000)
     and '750fe5c3f11c985f4ea63c4d0e6a98d0326f40b7'


Trivial merge