merge of 'bd1aedcfc0d89a11dd3dbbdca29b177ebb37278a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Apr 2007 17:53:08 +0000 (17:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Apr 2007 17:53:08 +0000 (17:53 +0000)
     and 'bd57e3a2384dcb07934621216542ba6fc94f536e'


Trivial merge