merge of '332a00dc550ca182177c40331ae4e05ba59793e0'
authorKoen Kooi <koen@openembedded.org>
Tue, 24 Jul 2007 18:44:33 +0000 (18:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 24 Jul 2007 18:44:33 +0000 (18:44 +0000)
     and 'aa744207a479e8c8226e2ab5eceab4897c4cd863'


Trivial merge