[MERGE] Two bug fixes

[Michael Ellerman]

Hi folks,

There's two bug fixes (#3452 and #32587) sitting on top of my random
stuff branch at:

http://michael.ellerman.id.au/files/bzr/mpe

cheers

------------------------------------------------------------
revno: 1534
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Tue 2006-02-28 20:19:09 +1100
message:
  Remove double class definition of TestLocationConfig. This causes another
  26 tests to be run, all of which pass.
------------------------------------------------------------
revno: 1533
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Tue 2006-02-28 20:10:32 +1100
message:
  Produce an intelligible error if the user's /etc/passwd is not encoded in
  UTF-8 and we're trying to decode it as UTF-8. This fixes bug 3452.