Merge remote-tracking branch 'origin/master' into stable
authorJiri Slaby <jslaby@suse.cz>
Tue, 17 Sep 2013 08:21:25 +0000 (10:21 +0200)
committerJiri Slaby <jslaby@suse.cz>
Tue, 17 Sep 2013 08:21:25 +0000 (10:21 +0200)
commit9dfc17fee15131bf788a1186750c0a9c6a6d8bd7
treeafbfec042aaba9f255d6312033bad2985da9a600
parent8091843411d0f7e1e9d6ba9acaa15e638853404a
parenta02d6b7ad1da5c1664a9f38f6716c815218e16b4
Merge remote-tracking branch 'origin/master' into stable

suse-commit: 76e317e0d16d62a44d846a5564ca5a788b202e26