merge of 'c676f4c47aca063e35fcb7797289ec8b489f8536'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 19:11:23 +0000 (19:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 19:11:23 +0000 (19:11 +0000)
     and 'd32021cb86bdd968e8bbc6eff3f4bebec313978e'


Trivial merge