Merge branch 'jhh-dev' of git://git.planet-lab.org/plstackapi into jhh-dev
authorroot <root@node46.princeton.vicci.org>
Mon, 22 Sep 2014 20:32:55 +0000 (20:32 +0000)
committerroot <root@node46.princeton.vicci.org>
Mon, 22 Sep 2014 20:32:55 +0000 (20:32 +0000)

Trivial merge