pg_dumpall Sets Roll default_tablespace Before Creating Tablespaces

Hackers,

We've just found an issue with pg_dumpall in 9.1.1 where a dump starts with lines like these:
   ALTER ROLE dude WITH NOSUPERUSER INHERIT NOCREATEROLE NOCREATEDB LOGIN PASSWORD
'md5bdd7f8e73a214981b1519212b02a5530'VALID UNTIL 'infinity';   ALTER ROLE dude SET default_tablespace TO 'users'; 

And later in the file has lines like this:
   CREATE TABLESPACE users OWNER postgres LOCATION '/data/postgres/pg_tblspc/users';

Unsurprisingly, perhaps, this results in errors such as:
   ERROR:  invalid value for parameter "default_tablespace": "users"

Seems to me that default_tablespace should only be set after tablespaces are created, no?

This is wreaking havoc with our ability to run pg_upgrade, FWIW.

Best,

David