merge of '37904b42e420b3ac5865f0832c2966dd7a6b91aa'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 27 Apr 2008 17:42:02 +0000 (17:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 27 Apr 2008 17:42:02 +0000 (17:42 +0000)
     and 'b062a489deb15fe1826aeff1619f8599a060bfaf'


Trivial merge