merge of '35442223e2d33755090d92a33d52bde6f6e207a1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Mar 2008 15:18:09 +0000 (15:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Mar 2008 15:18:09 +0000 (15:18 +0000)
     and '7050fca057f88bff7fa417c61f8dd6b9596a36ad'


Trivial merge