Merge branch 'QA_3_4'
commitfb597331076581de979b64f4794e49295c14d15c
authorMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 11:06:13 +0000 (26 12:06 +0100)
committerMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 11:06:13 +0000 (26 12:06 +0100)
treee7390887f33259a37a9b343175633973d5b8e445
parentb32e5b8235126dbee0c7eceb6c5be87f7cb011d1
parente0973de4a2b8685e35dd5d9b5bb8b084a6a7543d
Merge branch 'QA_3_4'