From: Josh Karlin <jkarlin@bbn.com>
Date: Tue, 8 Jun 2010 14:27:09 +0000 (+0000)
Subject: This is the code that Tony Mack merged into trunk.  Wanted to get a tag of it before... 
X-Git-Tag: geni-apiv1-totrunk
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2bb04b8c804861c827dbc2284accc94d4f96597e;p=sfa.git

This is the code that Tony Mack merged into trunk.  Wanted to get a tag of it before making any further modifications.
---