Merge commit '25d8571e2613260999052f75e77a043543033d3f' into stable
authorJiri Slaby <jslaby@suse.cz>
Thu, 26 Jul 2012 09:15:49 +0000 (11:15 +0200)
committerJiri Slaby <jslaby@suse.cz>
Thu, 26 Jul 2012 09:15:49 +0000 (11:15 +0200)
commit79fb0adf4ae39de2a334eecac8cf04fb1a00e17a
treea6e616ba162e099737d685a5f8ece191916aaecf
parent8d58193002198626031acd0a3f80c6b8a46c7e71
parent25d8571e2613260999052f75e77a043543033d3f
Merge commit '25d8571e2613260999052f75e77a043543033d3f' into stable