merge of '298d9a7548cea11e8e749665e126f35d1b357fa8'
authorStanislav Brabec <utx@penguin.cz>
Wed, 13 Aug 2008 11:03:28 +0000 (11:03 +0000)
committerStanislav Brabec <utx@penguin.cz>
Wed, 13 Aug 2008 11:03:28 +0000 (11:03 +0000)
commit45b3eb81fe9c7bd2d023957e11487bee04cec408
tree1012411954534a796e34a991381d7e90410df4b7
parent27ef4f645ac40f9b3762d18f454be388d593d747
parent1b057f3930c72a9fbfca37504e3746abe52e5b25
Merge ... '298d9a7548cea11e8e749665e126f35d1b357fa8'
     and '359cd693e28055b9860cd6a08d96acbd63c8461a'