merge of 'dde1602d414f1e9af9fbf46e7fea13cda79bdd4c'
authorKoen Kooi <koen@openembedded.org>
Sat, 2 Aug 2008 20:38:50 +0000 (20:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 2 Aug 2008 20:38:50 +0000 (20:38 +0000)
     and 'e7877fb9e5d6fe166efa6973b930549f64b7bccb'


Trivial merge