Merge remote-tracking branch 'origin/telescience-v0.2' into telescience-v0.2
[fw/altos] / contrib /
drwxr-xr-x   ..
drwxr-xr-x - arch-linux