Merged Helicon fixes

This commit is contained in:
feodor_fitsner 2012-09-14 09:44:58 -07:00
commit 38eb915d02
19 changed files with 737 additions and 261 deletions