How about this?

It addresses the issues raised here:
http://sourceware.org/ml/gdb-patches/2009-06/msg00689.html

This patch requires:
http://sourceware.org/ml/gdb-patches/2009-06/msg00521.html
which is unchanged (modulo the requested formatting change),
and was approved here:
http://sourceware.org/ml/gdb-patches/2009-06/msg00657.html