Merge branch 'QA_3_4'
commitf8efc6b05212532f4e1b5e95094e046b84070c63
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)
treeacc4aefc2e1ba731e1ab1084f449bd581ea87b63
parent9a65c1cba78066b9a023b85545319c0792f5c5ce
parent6a14c09699bbf97c620ea8fc9cf02e24ca78120d
Merge branch 'QA_3_4'