Merge branch 'MAINT_3_4_0' into QA_3_4
commit37a9ad1d9e56e10c1a54f9ab00930b605ea2590a
authorMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 10:08:22 +0000 (26 11:08 +0100)
committerMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 10:08:22 +0000 (26 11:08 +0100)
tree124cd33b075f73f305ccb0ee64617eb4ec6b0e71
parente9668dc2149540e53d26265cc35f970e87bcbcc9
parent00ec845626879be4b22a5723391492e96e92f7b4
Merge branch 'MAINT_3_4_0' into QA_3_4