Commit 2e781717db0e1bd18268068b36d1eef450654dcd

Steffen Jaeckel 2011-03-23T22:39:17

Merge remote-tracking branch 'dbussink/master'