merge of '545c0e37f05fb065b7d1cf9794137b60fa5113f7'
authorStanislav Brabec <utx@penguin.cz>
Sun, 18 May 2008 21:54:31 +0000 (21:54 +0000)
committerStanislav Brabec <utx@penguin.cz>
Sun, 18 May 2008 21:54:31 +0000 (21:54 +0000)
     and '7143762e383df9fc9356ff275341deee72ec1a85'


Trivial merge