Merge branch 'master' into stable
authorJiri Slaby <jslaby@suse.cz>
Fri, 20 Sep 2013 19:16:43 +0000 (21:16 +0200)
committerJiri Slaby <jslaby@suse.cz>
Fri, 20 Sep 2013 19:16:43 +0000 (21:16 +0200)
commite57282be07d6f5447940595e7a50b9beb64f5002
tree824de19a06b5dff788ac49025b4c18ef974459b9
parentd803bed5254507809685910c3a0877ba939f4114
parent2c27f7799698ab7d00ca2c4eb3163f48a23a2049
Merge branch 'master' into stable

suse-commit: feffbf9bbb20fa91790c44f28025c68e14082817