Merge branch 'MAINT_3_4_7' into MAINT_3_4_7-security
commit063e6f92929c3aed3641cf79add4128c7e972d2f
authorMichal Čihař <mcihar@suse.cz>
Mon, 7 Nov 2011 14:48:52 +0000 (7 15:48 +0100)
committerMichal Čihař <mcihar@suse.cz>
Mon, 7 Nov 2011 14:48:52 +0000 (7 15:48 +0100)
tree4f57aaef882aa2e048c156eeab1fd11c4001a7f8
parent34d99de000de9d15cfdf5e9cc8b7682d51110bbd
parent987f943de33a0d0aa6ac3e3c352d48ac4a527a6d
Merge branch 'MAINT_3_4_7' into MAINT_3_4_7-security