Merge branch 'eucalyptus-devel' of ssh://git.planet-lab.org/git/sfa into eucalyptus...
authorMarco Yuen <marcoy@gmail.com>
Wed, 22 Jun 2011 18:16:06 +0000 (14:16 -0400)
committerMarco Yuen <marcoy@gmail.com>
Wed, 22 Jun 2011 18:16:06 +0000 (14:16 -0400)

Trivial merge