merge of 'cb21251032df15f833bb72b7b562bd34e429a614'
authorKoen Kooi <koen@openembedded.org>
Sat, 20 Sep 2008 13:57:28 +0000 (13:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 20 Sep 2008 13:57:28 +0000 (13:57 +0000)
     and 'ed0945867c295509a51e1dd011326159cb251e70'


Trivial merge