Merge pull request #2 from brianmcgillion/master
authorjarkkos <jarkko.sakkinen@iki.fi>
Tue, 15 Nov 2011 10:04:23 +0000 (02:04 -0800)
committerjarkkos <jarkko.sakkinen@iki.fi>
Tue, 15 Nov 2011 10:04:23 +0000 (02:04 -0800)
Fix changes in coding convention


Trivial merge