Merge commit 'origin/master' into gallium-map-range
authorJosé Fonseca <jfonseca@vmware.com>
Wed, 4 Mar 2009 16:44:31 +0000 (16:44 +0000)
committerJosé Fonseca <jfonseca@vmware.com>
Wed, 4 Mar 2009 16:44:31 +0000 (16:44 +0000)

Trivial merge