Merge branch 'MAINT_3_4_0' into QA_3_4
commit6a14c09699bbf97c620ea8fc9cf02e24ca78120d
authorMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 11:41:57 +0000 (26 12:41 +0100)
committerMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 11:41:57 +0000 (26 12:41 +0100)
tree4a25691be87fbc2d498daaa4f9909bce9903b5c7
parent571b16f6815bba88b339fd4e5d82e6c61b8637fa
parent4f1a31638468fe61ca1310f8b74d40de67dd7c02
Merge branch 'MAINT_3_4_0' into QA_3_4