Merge branch 'MAINT_3_4_0' into QA_3_4
commit049eac2885fda4e056aeb7ca283c52f5a72cfaae
authorMichal Čihař <mcihar@novell.com>
Tue, 30 Nov 2010 14:51:58 +0000 (30 15:51 +0100)
committerMichal Čihař <mcihar@novell.com>
Tue, 30 Nov 2010 14:51:58 +0000 (30 15:51 +0100)
treef86f68e7ef7fcd8c18d9c0428c9786eebd55ae4e
parenta36238cb74a4bb17474708b8ef9f8ee3c6fe9038
parentb74af02589cb7e5fc41f94a58bfc733b68e7cfe3
Merge branch 'MAINT_3_4_0' into QA_3_4