merge of '4f00154cba657ea384b3472488ba540566f72326'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Sep 2007 09:25:42 +0000 (09:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Sep 2007 09:25:42 +0000 (09:25 +0000)
     and 'a7779f830bacf8db2339c35075cbd1b8a1cb490d'


Trivial merge