Merge pull request #1783 from jonfabe/bugfixes
authorjmarshallnz <jcmarsha@gmail.com>
Fri, 16 Nov 2012 23:45:15 +0000 (15:45 -0800)
committerjmarshallnz <jcmarsha@gmail.com>
Fri, 16 Nov 2012 23:45:15 +0000 (15:45 -0800)
Bugfixes


Trivial merge