merge of '45938c4e854b26ef7b60e687cbcc02feda47d03e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Oct 2007 16:34:37 +0000 (16:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Oct 2007 16:34:37 +0000 (16:34 +0000)
     and 'c7425c427ab2f0891cad1cb994d0e604526c5356'


Trivial merge