merge of '92277d433e8689dae991647461e4b7cbf7f3b2ab'
authorKoen Kooi <koen@openembedded.org>
Thu, 6 Sep 2007 08:19:29 +0000 (08:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 6 Sep 2007 08:19:29 +0000 (08:19 +0000)
     and 'ce91420f334d73451c6d91e2805ea5844eb6b4ae'


Trivial merge