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)
commit6e80b7ada5b0175f0a97a7b3787ce059e8960bbe
tree48b1cea923ec08c21afc06f544cf3ac05ca2cc78
parentcf24aa67b9d1eff14109dd95d74eb727c50635a0
parentf42f64dac6856629fa8e79187ab96d3343d639a7
Merge ... '860b69bfa86360af41373424bf5de0df598ab909'
     and 'da3f97933962edf6b59a6c431356796195acf199'