merge of '0c66b53f17f5196eb35fffef39265d813c870e1c'
authorKoen Kooi <koen@openembedded.org>
Thu, 14 Feb 2008 10:32:19 +0000 (10:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 14 Feb 2008 10:32:19 +0000 (10:32 +0000)
     and 'e3eea2ab1eb9f03b1640b15f0943c4fec05494cb'


Trivial merge