merge of '746afc454473a4b341411a3247c01c9b83c5606e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Sep 2008 13:16:28 +0000 (13:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Sep 2008 13:16:28 +0000 (13:16 +0000)
     and 'ad51ca9ac30054f5463b958893cb1fd5986330d4'


Trivial merge