merge of '66f82280631349e663f6931936195ed1819fcd86'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 Oct 2007 21:42:58 +0000 (21:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 Oct 2007 21:42:58 +0000 (21:42 +0000)
     and 'cfa480548db7b937e5fa73d80a37819a7c48609c'


Trivial merge