merge of '3aba2971138df7aa582ac37918b74312095155a5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 16 Apr 2008 18:11:58 +0000 (18:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 16 Apr 2008 18:11:58 +0000 (18:11 +0000)
     and 'f2ba366303b50ed577f12c11d8179b1c9c3e5255'


Trivial merge