merge of '430d5bdd401e0edc47bc1fd95e6a2c1f6df721e5'
authorStanislav Brabec <utx@penguin.cz>
Thu, 1 May 2008 18:58:57 +0000 (18:58 +0000)
committerStanislav Brabec <utx@penguin.cz>
Thu, 1 May 2008 18:58:57 +0000 (18:58 +0000)
     and 'e6d7705996dc996eef6bfa1e0041867696ab24cb'


Trivial merge