Merge branch 'MAINT_3_4_0' into QA_3_4
commitff18d660d6ccf291123ec37d05914d781ce19d84
authorMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 13:12:59 +0000 (26 14:12 +0100)
committerMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 13:12:59 +0000 (26 14:12 +0100)
tree8ec9773160eb4afd2850bb61d5fe515ae7a063cc
parent58be909ab2d76fe8243f93e8c56a88a0f1d077bf
parent32aee6e06f11ad368bd02cf080fb6d771dd9a0e2
Merge branch 'MAINT_3_4_0' into QA_3_4