merge of '5825bf6c4a28f3d0e119e70c98a835c4c371fd59'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Aug 2007 19:27:51 +0000 (19:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Aug 2007 19:27:51 +0000 (19:27 +0000)
     and '9533e255d05ed5eb30dca07a71647e870fe55952'


Trivial merge