merge of '6aff048ce0e2244277e9b1398c4a400bdd758e30'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Oct 2007 11:27:58 +0000 (11:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Oct 2007 11:27:58 +0000 (11:27 +0000)
     and 'eca725be04182c9d2ebab13eddbe22f7e48c2b17'


Trivial merge