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)
     and '359cd693e28055b9860cd6a08d96acbd63c8461a'


Trivial merge