Merge change 6186

* changes:
  Squashed commit of the following: Merged with batch, change to FORMAT_BATCH commit 4a6f359119771b7ac785aafcba757d049c82e490 Merge: e41dea4... 10063c1... Author: fmantek <fmantek@google.com> Date:   Fri Jul 3 14:58:11 2009 +0200