merge of 'b56480f5496377245fb319218acc01132afd55d4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jan 2008 11:23:51 +0000 (11:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jan 2008 11:23:51 +0000 (11:23 +0000)
     and 'e073022cc54795bb1f1d4970d0785a18d25a5136'


Trivial merge