Merge commit '236d8d7' into stable
authorJiri Slaby <jslaby@suse.cz>
Mon, 28 Jan 2013 12:35:15 +0000 (13:35 +0100)
committerJiri Slaby <jslaby@suse.cz>
Mon, 28 Jan 2013 12:35:15 +0000 (13:35 +0100)
commite93cd151277af75e7646144331eb5114153d7c33
treeaa271d0e1dd2ba38b217baa2c3fe369e067522e2
parenta453656d70cf01dac1ec44a32046f729c83b1151
parent236d8d708026ac6385b6a75d7031b9f7650ee699
Merge commit '236d8d7' into stable