merge of '464f86e91e3d4d47be8a4dc58c4d915ae7e86599'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Sep 2008 13:23:05 +0000 (13:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Sep 2008 13:23:05 +0000 (13:23 +0000)
     and '75bebaaae554249bd9c03215794dbd4e3d56671a'


Trivial merge