merge of '85bed711422189f6cd0b95f0a006355d223421ba'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Jan 2007 11:18:11 +0000 (11:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Jan 2007 11:18:11 +0000 (11:18 +0000)
     and 'd6e4205baf5089d50dbd56f79575fa80e4205b58'


Trivial merge