merge of '1ee552cc6f52635092d975d976326b9977dfc32e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Aug 2008 23:57:44 +0000 (23:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Aug 2008 23:57:44 +0000 (23:57 +0000)
     and '42b443ef8580ee734b2f0f0401489eef57a70a16'


Trivial merge