merge of '741da7c046302cd2a55436a833775a51b3118e29'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 6 Apr 2007 18:32:59 +0000 (18:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 6 Apr 2007 18:32:59 +0000 (18:32 +0000)
     and 'bd2a1b3443e4c99866c718f6aaa29ffc02817dd0'


Trivial merge