Merge branch 'MAINT_3_4_1' into QA_3_4
commit32cdee1d8ab988abc4f08a86bdb9067bb91fbe3c
authorMichal Čihař <mcihar@novell.com>
Tue, 17 May 2011 11:38:51 +0000 (17 13:38 +0200)
committerMichal Čihař <mcihar@novell.com>
Tue, 17 May 2011 11:38:51 +0000 (17 13:38 +0200)
tree67bed40158d4833d7f96be9a01feb44b2a21018c
parentbed8707eea1d20d1d9abda41182389c07a16d190
parenta22536915748fbaa4fa62ef6f624abfa5126891a
Merge branch 'MAINT_3_4_1' into QA_3_4