merge of '091511591b5d369f5f183c5300585f7f1b3ca830'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Dec 2007 12:14:01 +0000 (12:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Dec 2007 12:14:01 +0000 (12:14 +0000)
     and '91d52cdc54af4a2802967cfdab32c81d01922351'


Trivial merge