merge of '723287caa1b0cd2e362ab6dd69f9e8db2eaca821'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 13:18:45 +0000 (13:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 13:18:45 +0000 (13:18 +0000)
     and 'c07273f2dc49a66c31c6d5d925b7e24647366621'


Trivial merge