merge of '0861d84183b87e92faf78d32bd0fe71c50d9db81'
authorStanislav Brabec <utx@penguin.cz>
Thu, 14 Feb 2008 18:12:25 +0000 (18:12 +0000)
committerStanislav Brabec <utx@penguin.cz>
Thu, 14 Feb 2008 18:12:25 +0000 (18:12 +0000)
     and 'a74635b601bde68329566b8107d8a298996f1da8'


Trivial merge