bridge lines with commas in them will go poorly

Tor proposal 180 says

    SMETHOD <methodname> <address:port> [options]

  The 'address:port' part of an SMETHOD line is the address to put
  in the bridge line.  The Options part is a list of space-separated
  K:V flags that Tor should know about.  Recognized options are:

      - FORWARD:1

        If this option is set (for example, because address:port is not
        a publicly accessible address), then Tor needs to forward some
        other address:port to address:port via upnp-helper. Tor would
        then advertise that other address:port in the bridge line instead.

      - ARGS:K=V,K=V,K=V

        If this option is set, the K=V arguments are added to Tor's
        extrainfo document.

So that means bridge lines can have commas in them.

But Vidalia stores my bridges in vidalia.conf using a line like

Bridge=obfs2 128.31.0.34:1051, obfs2 212.112.242.160:49259

This is going to get ugly. Maybe there is a qt way to store sets of things that don't use normal letters as delimiters?

Hopefully the solution we choose will be clever enough to avoid dropping currently configured bridges.