merge of '92c05bc0b6ee1645537e1189be26b9962a1c5170'
authorKoen Kooi <koen@openembedded.org>
Sun, 13 Apr 2008 12:29:49 +0000 (12:29 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 13 Apr 2008 12:29:49 +0000 (12:29 +0000)
     and 'b4c276c777f8614628c038c3f75fb35493df20b7'


Trivial merge