Merge branch 'MAINT_3_4_0' into QA_3_4
commit5cda32da092764f38346f984fe28a5b9142365fe
authorMichal Čihař <mcihar@novell.com>
Tue, 10 May 2011 09:24:31 +0000 (10 11:24 +0200)
committerMichal Čihař <mcihar@novell.com>
Tue, 10 May 2011 09:24:31 +0000 (10 11:24 +0200)
tree5efe79d99eceaf90d4274d43251a852ca8cb6905
parenta604d2152904f663ad1061d4e759e893878c82fc
parentabbd8b5a3f36edd2c77e7bd6f1ce0b23876cc5be
Merge branch 'MAINT_3_4_0' into QA_3_4