Merge branch 'MAINT_3_4_7' into QA_3_4

Conflicts:
	ChangeLog
This commit is contained in:
Michal Čihař 2011-11-07 15:47:12 +01:00
commit 19c0de6be2

Diff Content Not Available