merge of '2095c71741c2d1d79a50f2d9ea052cada53ba7d0'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 23 May 2007 18:47:20 +0000 (18:47 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 23 May 2007 18:47:20 +0000 (18:47 +0000)
commit5599260fe5f7d401bc36c677245511855b63318c
treec90071ba06fe784fdb74067abe4330a52ed16992
parent1aa3d65c3f78f30a819217e97e3fd401f076ca7c
parenta8ab3ecbfc4b62c2752e6acf6f42971a0eaaf34b
Merge ... '2095c71741c2d1d79a50f2d9ea052cada53ba7d0'
     and 'a0522e7d7dc85bbbff61ba37e7b7c0069fc5f5b5'