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^0
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=411b97344edcec5fe8d06f5d6dd8d22c76519583;hp=5390d16fb34f722d39e441e249d6f979f2ae8934;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.
---