merge of '8a114c24deca9328747f14101e87db8845400833'
authorHolger Freyther <zecke@selfish.org>
Tue, 6 Mar 2007 19:23:13 +0000 (19:23 +0000)
committerHolger Freyther <zecke@selfish.org>
Tue, 6 Mar 2007 19:23:13 +0000 (19:23 +0000)
commit4830e248ffa0ba2a9b69b9a5fdd4933eaee7cad8
tree964dbc88e489cd7f431223aa96e9981ddd9e687d
parent5b98bc859513b2ba2f1ccb58f187ec193233d428
parentccab4b3ba6f2ccc5e598c9d2ec6405f4494ca200
Merge ... '8a114c24deca9328747f14101e87db8845400833'
     and 'f02f7da26cf1279907a41d7957e054f42575adbd'