merge of '4ea5971c2dd26e9c357b906128f0e339d80e3d50'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 21:24:36 +0000 (21:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 21:24:36 +0000 (21:24 +0000)
     and 'e651c4fa9a5d1fc6120cc2309e9cba1388cecc52'


Trivial merge