bitcoin/bitcoin — pull request #2074 by sipa (2012-12-04 23:27:52+00:00)
Title: Two minor inconvenience fixes

Nothing large, this fixes two minor inconveniences. See the commit messages for more information.