Merge branch 'MAINT_3_4_0' into QA_3_4
commitcc10a7635b9b1494904ce567c390213719c3b240
authorMichal Čihař <mcihar@novell.com>
Wed, 1 Dec 2010 09:37:30 +0000 (1 10:37 +0100)
committerMichal Čihař <mcihar@novell.com>
Wed, 1 Dec 2010 09:37:30 +0000 (1 10:37 +0100)
tree87312ee24b42b777984844c7fcb846a920020229
parentd1330c2a17798abff8dfee6bc72d29bd79167820
parentb1476d9d2c6c1e190a2385fce05d04c5403690ea
Merge branch 'MAINT_3_4_0' into QA_3_4