From: smbaker <smbaker@fc8clean.lan>
Date: Thu, 7 Jul 2011 17:49:24 +0000 (-0700)
Subject: Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sface
X-Git-Tag: sface-0.1-17~16
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=a2386b8ef9017756eed20f11ac9f8a6545f64e68

Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sface
---

a2386b8ef9017756eed20f11ac9f8a6545f64e68