fold both format descriptions into one
Authored by: sneumann 2013-09-01
Parent: [r151]
Child: [r153]