merge of 'a2e94fc6726520d64a4b0a9aa3e4609de4ec7bd2'
authorStanislav Brabec <utx@penguin.cz>
Mon, 14 Jul 2008 16:28:32 +0000 (16:28 +0000)
committerStanislav Brabec <utx@penguin.cz>
Mon, 14 Jul 2008 16:28:32 +0000 (16:28 +0000)
commit71505e393bea9e322d5b8863ec2d93b735dbd461
tree75e04c469ed72ab7406202e139fa92ff828f34c5
parent8708d361c3c725f7eedd04e730c68528e4390751
parent61c97701838acde5a7e6e2b25a0cd92b8dda8908
Merge ... 'a2e94fc6726520d64a4b0a9aa3e4609de4ec7bd2'
     and 'fd7e5dadc748e094b6f43b6a5f9ba54db3d3c695'