Merge branch 'MAINT_3_4_0' into QA_3_4
commitec519d5d251230b4bfd72cc22b2a2d29b30f3559
authorMichal Čihař <mcihar@novell.com>
Fri, 13 May 2011 09:54:22 +0000 (13 11:54 +0200)
committerMichal Čihař <mcihar@novell.com>
Fri, 13 May 2011 09:54:22 +0000 (13 11:54 +0200)
tree4db842348f8dfc3c28017fc6b2b5bdb01435d21c
parent584679c854920714516932d9ad11f7055530f464
parent43b41e2ed3020edb1c26e821c6ed4f5065dd364c
Merge branch 'MAINT_3_4_0' into QA_3_4