Merge branch 'master' into stable
authorJiri Slaby <jslaby@suse.cz>
Tue, 17 Sep 2013 17:55:40 +0000 (19:55 +0200)
committerJiri Slaby <jslaby@suse.cz>
Tue, 17 Sep 2013 17:55:40 +0000 (19:55 +0200)
commitd803bed5254507809685910c3a0877ba939f4114
treeeb758f0acf53489f3cdc00a96e573997b7d5db46
parent7a54e4a2dcedd48f2eb9c56215361f5e2574c470
parentd0134c6a248b3160ffc68b9dad4bf615d8dbf466
Merge branch 'master' into stable

suse-commit: 91820671cdfcf26804f9b44f16b2996f03918bcf