merge of 'b6b79b888f6614e2f1441f74961708403c889236'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 14 Mar 2007 19:27:16 +0000 (19:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 14 Mar 2007 19:27:16 +0000 (19:27 +0000)
     and 'c7ea86d4475f69fb92ca818821a50ae2d92922e1'


Trivial merge