Merge commit 'origin/gallium-0.1' into gallium-0.2
authorJosé Fonseca <jfonseca@vmware.com>
Wed, 31 Dec 2008 13:05:39 +0000 (13:05 +0000)
committerJosé Fonseca <jfonseca@vmware.com>
Wed, 31 Dec 2008 13:06:22 +0000 (13:06 +0000)

Trivial merge