Merge branch 'master' into stable
authorJiri Slaby <jslaby@suse.cz>
Mon, 4 Mar 2013 09:22:37 +0000 (10:22 +0100)
committerJiri Slaby <jslaby@suse.cz>
Mon, 4 Mar 2013 09:22:37 +0000 (10:22 +0100)
commit24081e4590289248c7b9ae6cf735b1602f15cfd1
tree44c85df48d3a20462529471e39826ca69ffe01d4
parent33dc9e2c1086a3658534974f25df2ffcf4e7eb11
parent1519491b4b76b6b2d2da76fc0f1052f08e4e0787
Merge branch 'master' into stable

suse-commit: 9871030a05e5415374c2b1fd3b0b8449ac2da1a9