Merge branch '0.5.0.x' into 0.5.x

Conflicts:
	contrib/debian/changelog

diff --cc contrib/debian/changelog
index 4510641,0c67487..5e38c7b
--- 1/contrib/debian/changelog
--- 2/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@@ -1,10 -1,13 +1,19 @@@
 -bitcoin (0.5.0.3-natty1) natty; urgency=low
++bitcoin (0.5.2-natty1) natty; urgency=low
+ 
+   * Remove mentions on anonymity in package descriptions and manpage.
+     These should never have been there, bitcoin isnt anonymous without
+     a ton of work that virtually no users will ever be willing and
+     capable of doing
+ 
+  -- Matt Corallo <matt@bluematt.me>  Sat, 7 Jan 2012 13:37:00 -0500
+ 
 -bitcoin (0.5.0.3-natty0) natty; urgency=low
 +bitcoin (0.5.2-natty0) natty; urgency=low
 +
 +  * New upstream release.
 +
 + -- Luke Dashjr <luke+bitcoin+deb@dashjr.org>  Fri, 16 Dec 2011 17:57:00 -0500
 +
 +bitcoin (0.5.1-natty0) natty; urgency=low
  
    * New upstream release.
  

diff --cc src/qt/bitcoingui.cpp
Simple merge

diff --cc src/qt/bitcoingui.h
Simple merge