merge of '27d9db34dfe6920ee9c44a4591002e8618746a0c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 May 2008 14:04:11 +0000 (14:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 May 2008 14:04:11 +0000 (14:04 +0000)
     and 'fadea704d0edbbc0f97766e6f45798f069a8d5b8'


Trivial merge