Merge remote-tracking branch 'origin/QA_3_4'
commitb4e7f0a6eabcd79d00e5bbcfee85f45d00d4a09f
authorMichal Čihař <mcihar@suse.cz>
Tue, 18 Oct 2011 09:50:29 +0000 (18 11:50 +0200)
committerMichal Čihař <mcihar@suse.cz>
Tue, 18 Oct 2011 09:50:29 +0000 (18 11:50 +0200)
tree22700ee4d2ce4eaa58a9e2f7eb5f94f0f271f280
parentcb1b6e3059cdbf276c4d0982ab886c53420e1ad6
parent3e6f8cc52cbbbe2589e47c42ac21c847a4e6f45f
Merge remote-tracking branch 'origin/QA_3_4'