merge of '3332520bb8031e881dcdc1cb97820a8d4e479e76'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Mar 2007 18:02:02 +0000 (18:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Mar 2007 18:02:02 +0000 (18:02 +0000)
     and '4098a08f55f40b0de343d3a1948293be774ea37e'


Trivial merge