merge of '4a1fbbf2b807b7eb3928563bc7f680eeced17553'
authorStanislav Brabec <utx@penguin.cz>
Tue, 15 Jul 2008 13:06:18 +0000 (13:06 +0000)
committerStanislav Brabec <utx@penguin.cz>
Tue, 15 Jul 2008 13:06:18 +0000 (13:06 +0000)
     and 'd8ffa6c8873c2065b7bd097d105c2bea68ac7d4a'


Trivial merge