merge of 'ae80749e4b78bcd1a09605ab422d6bca3ed0eac9'
authorKoen Kooi <koen@openembedded.org>
Sat, 14 Jun 2008 08:45:53 +0000 (08:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 14 Jun 2008 08:45:53 +0000 (08:45 +0000)
     and 'd942dfba8b566098a8d2eaed687295691c4716bc'


Trivial merge