merge of '45d7f2962e16b25cf29da125c1645096b5d7fe7e'
authorKoen Kooi <koen@openembedded.org>
Mon, 14 Jul 2008 08:39:13 +0000 (08:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 14 Jul 2008 08:39:13 +0000 (08:39 +0000)
     and 'aa0f52125342f4a172e931fd7a8aa4d951d9f7ec'


Trivial merge