Remove the defining of __DIR__ as that could really mess others up depending on it (on < php 5.3)
Merge branch 'master' into trunk