merge of '098b7308900ba9b5e6e5ff83f5e4a2f5d3b8da04'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 10 May 2007 13:47:25 +0000 (13:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 10 May 2007 13:47:25 +0000 (13:47 +0000)
     and 'f2dc6beec88697c9537743d5c6c32fad2d323ee3'


Trivial merge