merge of 3f0a9654c9edcee221d5d5fbb4421a37e22afb38
authorRod Whitby <rod@whitby.id.au>
Mon, 24 Apr 2006 21:31:06 +0000 (21:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 21:31:06 +0000 (21:31 +0000)
commitcbbfd9a62ca834df8d48aa45763ab1237b61405e
treec72664c5b13ff96794c45532527836f96f266078
parentff298281a111f10b05a35cb9322343e4c4f30a48
parent999c41bb4501f1d30ac2684489cedc601a12abae
merge of 3f0a9654c9edcee221d5d5fbb4421a37e22afb38
     and 888bba9e9eb91ecf014ac024cdb877b7aa217b38