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)

Trivial merge