Merge branch 'QA_3_4'
commitefec11a85f6afe74ed68803da591d8b13a66d2a6
authorMichal Čihař <michal@cihar.com>
Mon, 16 May 2011 22:29:35 +0000 (17 00:29 +0200)
committerMichal Čihař <michal@cihar.com>
Mon, 16 May 2011 22:29:35 +0000 (17 00:29 +0200)
treec1208ff0ac3647e20f94814904c4c71f0c7befc7
parentab9d0f35f1032defef1d33b5b3495914520ef610
parent3b9333baddaa1957f8feabc2515accdcc45964e8
Merge branch 'QA_3_4'