Some small changes around on my computer, that neede to be comitted.
Also a change for the new 2.0.0 RC1
Authored by: waldviertler 2010-12-31
Parent: [r3289]
Child: [r3291]
