merge of 'a1d436a1b0cce90dce4363a3bfd62bd8c6f53913'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 May 2008 20:34:12 +0000 (20:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 May 2008 20:34:12 +0000 (20:34 +0000)
     and 'e4016811f7d88c926c4dc798795d2b46651ddaf7'


Trivial merge