Merge commit '2f757104a6f120648a1abe5780bf8dc4fe8fb379' into stable
authorJiri Slaby <jslaby@suse.cz>
Wed, 1 Aug 2012 08:33:58 +0000 (10:33 +0200)
committerJiri Slaby <jslaby@suse.cz>
Wed, 1 Aug 2012 08:33:58 +0000 (10:33 +0200)
commit0836370f1e9faf03d46e79723536389550923461
tree626036af4fb81c44fcad1ca7d46eae9b5e2bec5f
parent79fb0adf4ae39de2a334eecac8cf04fb1a00e17a
parent2f757104a6f120648a1abe5780bf8dc4fe8fb379
Merge commit '2f757104a6f120648a1abe5780bf8dc4fe8fb379' into stable