merge of '1571018373f9f6226bf0385c78d6dbc62289ee93'
authorKoen Kooi <koen@openembedded.org>
Sun, 9 Sep 2007 08:47:08 +0000 (08:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 9 Sep 2007 08:47:08 +0000 (08:47 +0000)
     and '2fcb43373fb4b8e1c8c28db1ee32e1981d35bfb6'


Trivial merge