Client API refactoring branch merge

[Florian Müller]

Hi all,

If nobody objects, I will merge the client API refactoring branch into 
trunk this Wednesday.
If there are any reasons not to merge, please let me know as soon as 
possible!


Cheers,

Florian