Merge heads
authorDaniel P. Berrange <berrange@redhat.com>
Wed, 10 Sep 2008 11:33:56 +0000 (07:33 -0400)
committerDaniel P. Berrange <berrange@redhat.com>
Wed, 10 Sep 2008 11:33:56 +0000 (07:33 -0400)

Trivial merge