Merge remote-tracking branch 'origin/MAINT_3_4_8' into QA_3_4
commitadc1fb2c6c59aa4a3641073b10d47a6829e63aae
authorMichal Čihař <mcihar@suse.cz>
Fri, 2 Dec 2011 08:58:49 +0000 (2 09:58 +0100)
committerMichal Čihař <mcihar@suse.cz>
Fri, 2 Dec 2011 08:58:49 +0000 (2 09:58 +0100)
tree9be40ede0ce0bd1e34e0b98c4020167b3828d2b0
parent9832c283f40c10d56a2e1dc3bd57525131ca1e4c
parent3550b5adee887540a44a31bd5654f8c93d98d408
Merge remote-tracking branch 'origin/MAINT_3_4_8' into QA_3_4