Merge branch 'master' of https://github.com/bitcoin/bitcoin

Conflicts:
	.gitignore (used upstream version)
	bitcoin-qt.pro

diff --cc bitcoin-qt.pro
index eefef5a182674fb12d95e519f55a2cb303aa85ae,b9fecb848e59c0e60511357dd37df8bd3f231b32..290d5d9dfb94721ceba3341156b7870561f81661
--- 1/bitcoin-qt.pro
--- 2/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@@ -5,13 -5,19 +5,17 @@@ DEFINES += QT_GU
  # DEFINES += SSL
  CONFIG += no_include_pwd
  
 -# for boost 1.37, add -mt to the boost libraries
 -LIBS += -lssl -lcrypto -ldb_cxx
 -unix:!macx:LIBS += -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread
 -macx:LIBS += -lboost_system-mt -lboost_filesystem-mt -lboost_program_options-mt -lboost_thread-mt
 -macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3
 -windows:LIBS += -lboost_system-mgw44-mt-1_43 -lboost_filesystem-mgw44-mt-1_43 -lboost_program_options-mgw44-mt-1_43 -lboost_thread-mgw44-mt-1_43 -lws2_32 -lgdi32
 -windows:DEFINES += __WXMSW__
 -windows:RC_FILE = src/qt/res/bitcoin-qt.rc
 -
 +# for boost 1.37, add -mt to the boost libraries 
 +# use: qmake BOOST_LIB_SUFFIX=-mt
 +
 +# Dependency library locations can be customized with BOOST_INCLUDE_PATH, 
 +#    BOOST_LIB_PATH, BDB_INCLUDE_PATH, BDB_LIB_PATH
 +#    OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively
 +
+ OBJECTS_DIR = build
+ MOC_DIR = build
+ UI_DIR = build
+ 
  # use: qmake "USE_UPNP=1"
  # miniupnpc (http://miniupnp.free.fr/files/) must be installed
  count(USE_UPNP, 1) {

diff --cc src/main.cpp
Simple merge

diff --cc src/util.h
Simple merge