merge of '1a21079a72078639c12d843797719e166601e64e'
authorKoen Kooi <koen@openembedded.org>
Thu, 17 May 2007 08:02:57 +0000 (08:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 17 May 2007 08:02:57 +0000 (08:02 +0000)
     and '64fe11e01c9845f19dd3d5403d1680b675228460'


Trivial merge