Merge commit '9f86828' into stable
authorJiri Slaby <jslaby@suse.cz>
Thu, 17 Jan 2013 22:03:20 +0000 (23:03 +0100)
committerJiri Slaby <jslaby@suse.cz>
Thu, 17 Jan 2013 22:03:20 +0000 (23:03 +0100)
commit8eb6368eff58747df68d4b0e69bf5cc2d57c7e7c
treeb2653948510c1b8cd546fb3cd08a5325c972a17e
parentaf76f805390b144ff850ff1d42307b99f23c34bf
parent9f86828dc477f81836bb2638abf807a541965540
Merge commit '9f86828' into stable