merge of '3e6216a45414da116d701e5ace53a09e1c10f258'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 17:12:08 +0000 (17:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 17:12:08 +0000 (17:12 +0000)
     and 'e42568a54d15c18dcefabdfde6196ebefc9febe1'


Trivial merge