Merge branch 'signal-performance'
authorAlexander Larsson <alexl@redhat.com>
Mon, 5 Mar 2012 11:29:45 +0000 (12:29 +0100)
committerAlexander Larsson <alexl@redhat.com>
Mon, 5 Mar 2012 11:29:45 +0000 (12:29 +0100)

Trivial merge