merge of 0248315b9fe761433566e0707c8fbad66689a3af
authorKoen Kooi <koen@openembedded.org>
Thu, 27 Apr 2006 14:48:46 +0000 (14:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Apr 2006 14:48:46 +0000 (14:48 +0000)
     and 060d946096395a1f0639f18f63d678fe52f718bd


Trivial merge