merge of '8e15d4e806ea459070da1867571a1c81f6748e33'
authorStanislav Brabec <utx@penguin.cz>
Mon, 25 Feb 2008 23:14:08 +0000 (23:14 +0000)
committerStanislav Brabec <utx@penguin.cz>
Mon, 25 Feb 2008 23:14:08 +0000 (23:14 +0000)
     and 'c720c1f0f144601f43a22e4c9d8312e8df0db716'


Trivial merge