Merge pull request #1366 from ether/master

Bring develop up to date with master
This commit is contained in:
Marcel Klehr 2013-01-17 08:42:21 -08:00
commit 88e42dd109

Diff content is not available