Merge branch 'master' into telescience-v0.2
authorKeith Packard <keithp@keithp.com>
Wed, 16 Jan 2013 23:22:46 +0000 (15:22 -0800)
committerKeith Packard <keithp@keithp.com>
Wed, 16 Jan 2013 23:22:46 +0000 (15:22 -0800)
commita04c4f7b07e97d568f8f6f56dd363329817fb52c
treef910404d47850c6e7022b8fc3f87292b2b2b6d53
parent0c2fa9614ffe22901ba0fd089e1e02c362f9fbe0
parentbd84dfd8e53d8939281993e062015f67c0dd9fa2
Merge branch 'master' into telescience-v0.2
src/Makefile