merge of '860b69bfa86360af41373424bf5de0df598ab909'
authorStanislav Brabec <utx@penguin.cz>
Thu, 27 Mar 2008 22:39:06 +0000 (22:39 +0000)
committerStanislav Brabec <utx@penguin.cz>
Thu, 27 Mar 2008 22:39:06 +0000 (22:39 +0000)
     and 'da3f97933962edf6b59a6c431356796195acf199'


Trivial merge