Merge branch 'master' into bnc#638476_groups
authormzugec <mzugec@suse.cz>
Tue, 5 Oct 2010 11:40:34 +0000 (13:40 +0200)
committermzugec <mzugec@suse.cz>
Tue, 5 Oct 2010 11:40:34 +0000 (13:40 +0200)
commit28c0caf7dd2a11510363fcc4bd41bfa13c60217b
tree534334ceca574a4d3f74d79750d99baf0fa97627
parent31389a31114809d88a22418975f23cb5d187edaf
parentd64bb7f4953056a5425f03c1e8c807222e24121f
Merge branch 'master' into bnc#638476_groups