merge of '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'
authorKoen Kooi <koen@openembedded.org>
Thu, 4 Sep 2008 10:19:05 +0000 (10:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 4 Sep 2008 10:19:05 +0000 (10:19 +0000)
     and '9ead7c7a970fd9cac9a8f7314036254e85d786dc'


Trivial merge