merge of '0096bd317f3e43db1d530c41ae39d2682a227b51'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Oct 2007 15:06:30 +0000 (15:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Oct 2007 15:06:30 +0000 (15:06 +0000)
     and '0ae58917d460020990b038630d35c74df4f95059'


Trivial merge