Merge branch 'QA_3_4'master
commit3d0499c185bdb33cb619600d97b62989c693d5b9
authorMichal Čihař <mcihar@novell.com>
Wed, 11 May 2011 12:50:40 +0000 (11 14:50 +0200)
committerMichal Čihař <mcihar@novell.com>
Wed, 11 May 2011 12:50:40 +0000 (11 14:50 +0200)
tree246845d487e6740e16f801c675912208b50358c3
parent4bcbd156e45320e6483d8c4673d81b05a54c8b3b
parent6cd25a93f6cb8bb9fd98ee2399930ea5e70fdc88
Merge branch 'QA_3_4'