Merge remote-tracking branch 'origin/master' into stable
authorJiri Slaby <jslaby@suse.cz>
Tue, 17 Sep 2013 15:59:43 +0000 (17:59 +0200)
committerJiri Slaby <jslaby@suse.cz>
Tue, 17 Sep 2013 15:59:43 +0000 (17:59 +0200)
commit7a54e4a2dcedd48f2eb9c56215361f5e2574c470
treeeb758f0acf53489f3cdc00a96e573997b7d5db46
parent9dfc17fee15131bf788a1186750c0a9c6a6d8bd7
parentf9b511f62ff2879a4bf32d60f774e4b577316e75
Merge remote-tracking branch 'origin/master' into stable

suse-commit: 990059fabbb5a33a82738e370eca3414abc79159