merge of '156573f21daba762fc9410e3cbeb2c3e7fdebc21'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 22:10:32 +0000 (22:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 22:10:32 +0000 (22:10 +0000)
     and '9defb4ea3b59c767618beab8ee9a5441c6ba4797'


Trivial merge