merge of '664c903716e2388f94905f48588afd5542b78fc6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 21:49:13 +0000 (21:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 21:49:13 +0000 (21:49 +0000)
     and '7f8cad96c8dde93c85aa34ce420a3a852cbdf6ad'


Trivial merge