merge of '8d32cbe07454eff5b14e5fb3516faffd68cc9a72'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Feb 2007 17:18:29 +0000 (17:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Feb 2007 17:18:29 +0000 (17:18 +0000)
     and 'f1b01b4d8de851be420cc84f9859d3c0a22ce1d5'


Trivial merge