Merge pull request #641 from nico/ocd2
authorNico Weber <nicolasweber@gmx.de>
Fri, 23 Aug 2013 19:22:08 +0000 (12:22 -0700)
committerNico Weber <nicolasweber@gmx.de>
Fri, 23 Aug 2013 19:22:08 +0000 (12:22 -0700)
Minor style fixes, no behavior change.


Trivial merge