Merge branch 'master' into eucalyptus-devel
authorMarco Yuen <marcoy@gmail.com>
Fri, 15 Apr 2011 18:12:47 +0000 (14:12 -0400)
committerMarco Yuen <marcoy@gmail.com>
Fri, 15 Apr 2011 18:12:47 +0000 (14:12 -0400)

Trivial merge