Merge branch 'master' into elf-move
authorAndreas Jaeger <aj@suse.de>
Tue, 20 Mar 2012 19:40:16 +0000 (20:40 +0100)
committerAndreas Jaeger <aj@suse.de>
Tue, 20 Mar 2012 19:40:16 +0000 (20:40 +0100)

Trivial merge