merge of '101eec5076cbe6de0504b5ce78498024e3c16e03'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Apr 2008 14:04:37 +0000 (14:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Apr 2008 14:04:37 +0000 (14:04 +0000)
     and '53534b02ad19a4d9ac608eedde7747fa84f7f8fc'


Trivial merge