Merge pull request #664 from tobiasd/issue_554
authorfermionic <fermion@gmx.com>
Fri, 19 Apr 2013 01:37:11 +0000 (18:37 -0700)
committerfermionic <fermion@gmx.com>
Fri, 19 Apr 2013 01:37:11 +0000 (18:37 -0700)
Issue 554


Trivial merge