Alexander Neundorf authored Sep 30, 2012 and Brad King committed Nov 06, 2012

This is intentionally a separate commit, so the parent commit which
changes the logic is small and not mixed with formatting (indentation)
changes.  So, this patch here does not change any logic.

Alex