merge of 'd125bf400582faeb1540478ae087da821b077b4a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 14 Feb 2007 08:54:50 +0000 (08:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 14 Feb 2007 08:54:50 +0000 (08:54 +0000)
     and 'eb2aaa8111ec4c420d768c8f835d142e4dd9b68f'


Trivial merge