Merge branch 'master' into bug13658-branch
authorAndreas Jaeger <aj@suse.de>
Thu, 15 Mar 2012 08:55:49 +0000 (09:55 +0100)
committerAndreas Jaeger <aj@suse.de>
Thu, 15 Mar 2012 08:55:49 +0000 (09:55 +0100)
commit556b0b6130a6f4163a2aa6c82c5176e053292385
tree69684db3b4145576984d20c2997bd9479f477657
parent22417c803dbcfab05a7b94b903610cc53aef9af7
parent559398ab746fd7dbbe09e847813a1b917b9ded14
Merge branch 'master' into bug13658-branch