merge of '1b4c6de83b5df499179899a549a0e828450e5f48'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 May 2008 16:53:57 +0000 (16:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 May 2008 16:53:57 +0000 (16:53 +0000)
     and 'a35e2ad2f017a5ac5548780f30e3365bbe93d48a'


Trivial merge