merge of '089195e6226693953dd9be785e533fa29173045a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jun 2008 19:07:39 +0000 (19:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jun 2008 19:07:39 +0000 (19:07 +0000)
     and '764a3b1e5fd150d455e950bb13047d41a6173353'


Trivial merge