Merge remote-tracking branch 'origin/telescience-v0.2' into telescience-v0.2
authorKeith Packard <keithp@keithp.com>
Wed, 16 Jan 2013 18:40:28 +0000 (10:40 -0800)
committerKeith Packard <keithp@keithp.com>
Wed, 16 Jan 2013 18:40:28 +0000 (10:40 -0800)
commit0c2fa9614ffe22901ba0fd089e1e02c362f9fbe0
treea84d994358f8018ab7fa2298607d48828f525f35
parent456120d201d72c89576a0c8d69b2fcba44169507
parentf2b59cf3d30425bc4b12f37e86832e40b7702d3d
Merge remote-tracking branch 'origin/telescience-v0.2' into telescience-v0.2