merge of '22070216e65cf80581c36bade36576e881fc55b9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Mar 2008 18:59:48 +0000 (18:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Mar 2008 18:59:48 +0000 (18:59 +0000)
     and 'cb11d308ad141da3565a5b53318e124406257a86'


Trivial merge