Merge debian.(none):/MySQL/M50/indent-5.0

into  debian.(none):/MySQL/M51/indent-5.1

Manual merge of a formatting change.


Makefile.am:
  Manual merge of the formatting change in 5.0,
  the test actions differ so much that automerge doesn't work.