merge of '3b9fd83e9698bae081197909b331c676eba025fd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Nov 2007 16:18:38 +0000 (16:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Nov 2007 16:18:38 +0000 (16:18 +0000)
     and 'a34feb8c5cd32b70487440b494c3f223e50b122d'


Trivial merge