merge of '0135b9c8cb83a5549aee08d6ce8638b76d8230a4'
authorKoen Kooi <koen@openembedded.org>
Fri, 24 Aug 2007 13:17:54 +0000 (13:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 24 Aug 2007 13:17:54 +0000 (13:17 +0000)
     and '340da43485a96531933592289a8115f52a246a86'


Trivial merge