merge of 4ed4d06c5ea603aeb65c4f23220d3a64c7e917c8
authorKoen Kooi <koen@openembedded.org>
Sat, 15 Apr 2006 21:52:32 +0000 (21:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 15 Apr 2006 21:52:32 +0000 (21:52 +0000)
     and 8c18de8e683dcd5c02a273e3df84472d13182c02


Trivial merge