Merge commit 'krh/master'
authorJames Bowes <jbowes@redhat.com>
Mon, 23 Jun 2008 18:52:39 +0000 (14:52 -0400)
committerJames Bowes <jbowes@redhat.com>
Mon, 23 Jun 2008 18:52:39 +0000 (14:52 -0400)

Trivial merge