merge of '64b4d4f122fe8531d9c08f7e98f633c6a0a1b171'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Aug 2007 17:47:18 +0000 (17:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Aug 2007 17:47:18 +0000 (17:47 +0000)
     and 'd839f215519a9a54cb807f39abfc917295da81f2'


Trivial merge