Do not reorganize if new branch has same amount of work
Change 'make' to $(MAKE) in leveldb make command line
Simplify CMutexLock

o Remove unused Leave and GetLock functions
o Make Enter and TryEnter private.
o Simplify Enter and TryEnter.
  boost::unique_lock doesn't really know whether the
  mutex it wraps is locked or not when the defer_lock
  option is used.
  The boost::recursive_mutex does not expose this
  information, so unique_lock only infers this
  knowledge.  When taking the lock is defered, it
  (randomly) assumes that the lock is not taken.
  boost::unique_lock has the following definition:

        unique_lock(Mutex& m_,defer_lock_t):
            m(&m_),is_locked(false)
        {}

        bool owns_lock() const
        {
            return is_locked;
        }
  Thus it is a mistake to check owns_lock() in Enter
  and TryEnter - they will always return false.
Split off CBlockHeader from CBlock

Cleaner and removes the need for the application-specific flags in
serialize.h.
Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown()

- can be triggerd by just adding -proxy=crashme with 0.7.1
- crash occured, when AppInit2() was left with return false; after the
  first call to bitdb.open() (Step 6 in init)
- this is caused by GetDataDir() or .string() in CDBEnv::EnvShutdown()
  called via the bitdb global destructor
- init fDbEnvInit and fMockDb to false in CDBEnv::CDBEnv()
Merge pull request #2024 from Diapolo/fix_qt_crash

Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown()
Merge pull request #1980 from sipa/noreorgsame

Do not reorganize if new branch has same amount of work
Merge pull request #2013 from sipa/blockheader

Split off CBlockHeader from CBlock
Merge pull request #2004 from alexanderkjeldaas/simplify-cmutexlock

Simplify CMutexLock
update CClientUIInterface and remove orphan Wx stuff

- fix ThreadSafeMessageBox always displays error icon
- allow to specify MSG_ERROR / MSG_WARNING or MSG_INFORMATION without a
  custom caption / title
- allow to specify CClientUIInterface::ICON_ERROR / ICON_WARNING and
  ICON_INFORMATION (which is default) as message box icon
- remove CClientUIInterface::OK from ThreadSafeMessageBox-calls, as
  the OK button will be set as default, if none is specified
- prepend "Bitcoin - " to used captions
- rename BitcoinGUI::error() -> BitcoinGUI::message() and add function
  documentation
- change all style parameters and enum flags to unsigned
- update code to use that new API

- update Client- and WalletModel to use new BitcoinGUI::message() and
  rename the classes error() method into message()
- include the possibility to supply the wanted icon for messages from
  Client- and WalletModel via "style" parameter
do not silently ignore errors on "backupwallet" RPC cmd
Merge pull request #1988 from Diapolo/ThreadSafeMessageBox

update CClientUIInterface and remove orphan Wx stuff
Merge pull request #2006 from robbak/make-leveldb-macro

Change 'make' to $(MAKE) in leveldb make command line
Merge pull request #2044 from Diapolo/backupwallet

do not silently ignore errors on "backupwallet" RPC cmd
Merge remote-tracking branch 'origin/master' into importprivatekey

Conflicts:
	src/qt/bitcoingui.cpp