merge of 'a81be4a9e6a337df1765dd0899498f17ec68c272'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 11:31:26 +0000 (11:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 11:31:26 +0000 (11:31 +0000)
     and 'bb0941c6eb0d7eb6f9d46101e8bc68c672d6ccc4'


Trivial merge