Merge branch 'MAINT_3_4_0' into QA_3_4
commit1486abddef7f4e5e317b4a27fee01849d7b429b0
authorMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 14:38:50 +0000 (26 15:38 +0100)
committerMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 14:38:50 +0000 (26 15:38 +0100)
treeaee7dfb6248a11f1765e0500b16b71a9492fd769
parent968a8d2ad72a831a3447b3e9785da21878ee7fed
parent1aff32ac2c5a1f91ce6656970136d34966ca0e4c
Merge branch 'MAINT_3_4_0' into QA_3_4