Merge pull request #527 from fermionic/20121106-frost-updates
authorfermionic <fermion@gmx.com>
Wed, 7 Nov 2012 15:41:17 +0000 (07:41 -0800)
committerfermionic <fermion@gmx.com>
Wed, 7 Nov 2012 15:41:17 +0000 (07:41 -0800)
frost updates


Trivial merge