Merge remote branch 'origin/master'

This commit is contained in:
Jan Engelhardt
2011-01-22 18:10:18 +01:00