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)
commitf00301dbb4db8fcbca52b13a54be804f007b6780
treeffcc5d7b65ee70046e691b8e450f25e0229ea0a8
parent7363bd601a48848e4309fada1daa4937efe3ef28
parent1c992c7413e90f210bedbf4b05ae2bd6e988bcbe
Merge ... '430d5bdd401e0edc47bc1fd95e6a2c1f6df721e5'
     and 'e6d7705996dc996eef6bfa1e0041867696ab24cb'