Merge heads
authorDaniel P. Berrange <berrange@redhat.com>
Mon, 22 Sep 2008 22:07:47 +0000 (18:07 -0400)
committerDaniel P. Berrange <berrange@redhat.com>
Mon, 22 Sep 2008 22:07:47 +0000 (18:07 -0400)

Trivial merge