Code

Merge pull request #1 from barak/master
authorFlorian Forster <github@nospam.verplant.org>
Sat, 27 Aug 2011 15:00:37 +0000 (08:00 -0700)
committerFlorian Forster <github@nospam.verplant.org>
Sat, 27 Aug 2011 15:00:37 +0000 (08:00 -0700)
upstream update + tweaks


Trivial merge