Merge commit 'b8bb5ac7110f3685ebe37938fb6014ccbaa64e0b' into stable
authorJiri Slaby <jslaby@suse.cz>
Fri, 11 Jan 2013 19:17:27 +0000 (20:17 +0100)
committerJiri Slaby <jslaby@suse.cz>
Fri, 11 Jan 2013 19:17:27 +0000 (20:17 +0100)
commitaf76f805390b144ff850ff1d42307b99f23c34bf
treee5a05369e81931fd82f24c0f52a95ad884b94d25
parentae1c5928ffc2d5184165e658bbc03e497f78f5e8
parentb8bb5ac7110f3685ebe37938fb6014ccbaa64e0b
Merge commit 'b8bb5ac7110f3685ebe37938fb6014ccbaa64e0b' into stable