merge of a9f324c20ac7e7ac1d2a2525d55b2e2894aac109
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Feb 2006 13:02:23 +0000 (13:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Feb 2006 13:02:23 +0000 (13:02 +0000)
     and c945bc8161c3df7b0862623cecfd4c6d3acb7be0


Trivial merge