merge of 31c5baa26e5b5993142fafde34198358342c9a30
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Mar 2006 09:38:01 +0000 (09:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Mar 2006 09:38:01 +0000 (09:38 +0000)
     and 58fe56d49f6ab653044effe79a8f3e8bdea58e4a


Trivial merge