Merge commit 'ba0ac30dac551b25f1b020b82cff52bec25b9f13' into stable
authorJiri Slaby <jslaby@suse.cz>
Tue, 19 Feb 2013 16:52:26 +0000 (17:52 +0100)
committerJiri Slaby <jslaby@suse.cz>
Tue, 19 Feb 2013 16:52:26 +0000 (17:52 +0100)
commite56d5809480f2337793d228e4c28ab7fe3b5a934
treee87b5b5b74ba8ebb340c1254a24372dbc01b10e8
parentae1c506083953e8aeb49533b0a9c79fa9c3ffcec
parentba0ac30dac551b25f1b020b82cff52bec25b9f13
Merge commit 'ba0ac30dac551b25f1b020b82cff52bec25b9f13' into stable