Merge remote branch 'origin/master'
authorJosé Fonseca <jfonseca@vmware.com>
Fri, 5 Feb 2010 13:50:24 +0000 (13:50 +0000)
committerJosé Fonseca <jfonseca@vmware.com>
Fri, 5 Feb 2010 13:50:24 +0000 (13:50 +0000)

Trivial merge