Code formatting/indentation unified in trunk