merge of '976fd3ee118be06b85173fee9f4eaf90e321822d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 15 Aug 2007 17:47:47 +0000 (17:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 15 Aug 2007 17:47:47 +0000 (17:47 +0000)
     and 'a505ece6d3699f2da6fbe6590ac611befdcc5bdf'


Trivial merge