Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/plcapi
authorsmbaker <smbaker@fc8clean.lan>
Tue, 16 Oct 2012 15:54:41 +0000 (08:54 -0700)
committersmbaker <smbaker@fc8clean.lan>
Tue, 16 Oct 2012 15:54:41 +0000 (08:54 -0700)

Trivial merge