Merge branch 'QA_3_4'
commitbc0cebe1de9f6404ea0cdf485426d0172f78b261
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)
tree8ed649dbd219673e693a3bae93de9b10a080b6c0
parent4ece6061d8aee8b862bb56f6e89e326fbbc3f7f2
parentff18d660d6ccf291123ec37d05914d781ce19d84
Merge branch 'QA_3_4'