Merge pull request #2 from wasinger/2.3

[2.3] several fixes to make it work with sf 2.3 and PHP 5.3
Merge branch '2.3', remote branch 'upstream/2.3' into 2.3