merge of '44f1e05faf7c7b048dbf53c08ede5b091b16a321'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Jan 2007 08:40:05 +0000 (08:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Jan 2007 08:40:05 +0000 (08:40 +0000)
commitf2a8bfcef647a757bdc86cdff43888714d3f3b0d
tree4a870fe96ffc3d048e22039410df20452601a3b7
parentd8d6c432bdc95f7ce9500ada93b1f716dafc7891
parentc6513255ea6c80568472c317339f693f75c26407
Merge ... '44f1e05faf7c7b048dbf53c08ede5b091b16a321'
     and 'c9364961fa6fec14e6bb79b94e98bde8d4881912'