Merge commit 'ebc99566d412e8a3c47849234321d4b92f23f110' into stable
authorJiri Slaby <jslaby@suse.cz>
Mon, 27 Aug 2012 12:50:53 +0000 (14:50 +0200)
committerJiri Slaby <jslaby@suse.cz>
Mon, 27 Aug 2012 12:50:53 +0000 (14:50 +0200)
commit798a508e5d5c17af5dabe21dc5670245a93e10b2
tree91c343b4fd04714a6ea42c7094d8c9550ed65b11
parentffb9fbd257a3a167089c0bed5c7bdbed6576a4d8
parentebc99566d412e8a3c47849234321d4b92f23f110
Merge commit 'ebc99566d412e8a3c47849234321d4b92f23f110' into stable