Merge branch 'master' into region32
authorSøren Sandmann <sandmann@redhat.com>
Mon, 9 Jun 2008 03:39:29 +0000 (23:39 -0400)
committerSøren Sandmann <sandmann@redhat.com>
Mon, 9 Jun 2008 03:39:29 +0000 (23:39 -0400)

Trivial merge