merge of '75b7f0187937ff0cf23ec400350462b0cba2592b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Mar 2007 00:27:20 +0000 (00:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Mar 2007 00:27:20 +0000 (00:27 +0000)
     and 'd8a8e9bbd96a4458ef82b6a464d3f72deb83a546'


Trivial merge