merge of '50c7f89abe3b8e0587d863672399614b1f2cb6d5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Sep 2008 10:25:40 +0000 (10:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Sep 2008 10:25:40 +0000 (10:25 +0000)
     and '9daaac3730faf9e4dc3c89cd380025bec6460aed'


Trivial merge