Merge branch 'work'
authorBenjamin Otte <otte@redhat.com>
Wed, 10 Mar 2010 19:52:06 +0000 (20:52 +0100)
committerBenjamin Otte <otte@redhat.com>
Wed, 10 Mar 2010 19:52:06 +0000 (20:52 +0100)

Trivial merge