Merge branch 'QA_3_4'
commit064e875f10b0244a15da56c4ca590d516c51f6b6
authorMichal Čihař <michal@cihar.com>
Mon, 9 May 2011 05:43:00 +0000 (9 07:43 +0200)
committerMichal Čihař <michal@cihar.com>
Mon, 9 May 2011 05:43:00 +0000 (9 07:43 +0200)
tree708575ba08d98d434c11d04a82f7d44a9c80ee45
parent50bc50ecdf924b441756c440195f9d5d8dcfd643
parenta22c528ad40cc20924ec789ace883d29193f4761
Merge branch 'QA_3_4'