syncing with my current work, updating to 1.2, see changelog
Authored by: florianlink 2009-04-09
Parent: [r45]
Child: [r47]