merge of '58e9f09193fc3310302cb57483cca72a70c0f6f9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Nov 2007 00:27:26 +0000 (00:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Nov 2007 00:27:26 +0000 (00:27 +0000)
     and '669002f7b6f5c856c074448bc75bf86099ab5f11'


Trivial merge