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)
commit4cd135021235febf37b5f04cee4174b05a75f57e
tree4c7d22f72e5c425c92bb2a0129865e72c53058e2
parent97eaf23d080c5eeb75c7a40f98fa355e80dd787a
parentc2faa0722e6c264b18d69a2f3f37fe5b81a9e675
Merge ... '098b7308900ba9b5e6e5ff83f5e4a2f5d3b8da04'
     and 'f2dc6beec88697c9537743d5c6c32fad2d323ee3'