merge of '4cb57a7e78a706388906290afb6ab438e669072a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 15 Mar 2008 20:34:02 +0000 (20:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 15 Mar 2008 20:34:02 +0000 (20:34 +0000)
     and '6e0de74e2cca9def0790de8f3cd7446e3df6ea12'


Trivial merge