Merge branch 'vmx'
authorSøren Sandmann <sandmann@redhat.com>
Sun, 8 Jun 2008 23:55:43 +0000 (19:55 -0400)
committerSøren Sandmann <sandmann@redhat.com>
Sun, 8 Jun 2008 23:55:43 +0000 (19:55 -0400)

Trivial merge