Bugfix: getwork: NULL pindexPrev across CreateNewBlock, in case it fails
Merge branch 'bugfix_CNBerr_daggy' into bugfix_CNBerr

Conflicts:
	rpc.cpp
Bugfix: getmemorypool: NULL pindexPrev across CreateNewBlock, in case it fails
CreateNewBlock: Check that the produced CBlock is acceptable (except for proof-of-work and merkletree, since those need to be provided later)

This throws an exception from CreateNewBlock otherwise, which is not safe without #1245!
Merge branch 'checknewblock_0.6.0' into checknewblock

Conflicts:
	src/main.cpp
Run BDB disk-less for test_bitcoin
Tests for CreateNewBlock
optionsdialog cleanup

- remove duplicate includes, that are already present in ui_optionsdialog.h
- change QIntValidator to not allow 0 as port-number
- re-order some function calls to match the Ui element order, for better readbility and to prepare for the addition of further IPv6 and Tor proxy options
- restat warning for the language selection is only shown, when the language was changed (not on simply activating the Ui element)
- split check for object == ui->proxyIp into seperate if-clause
- micro-optimize the code in the above mentioned if-clause
- unify used format for comments in the code
- introduce handleProxyIpValid() function, which handles UI elements and the
save button states for valid/invalid proxy IPs
Merge pull request #1631 from laanwj/2012_07_translationsupdate

Update translation messages
Merge branch 'bugfix_CNBerr' of git://github.com/luke-jr/bitcoin
Merge branch 'checknewblock' of git://github.com/luke-jr/bitcoin
When creating new blocks, sort 'paid' area by fee-per-kb

Modify CreateNewBlock so that instead of processing all transactions
in priority order, process the first 27K of transactions in
priority order and then process the rest in fee-per-kilobyte
order.

This is the first, minimal step towards better a better fee-handling
system for both miners and end-users; this patch should be easy
to backport to the old versions of Bitcoin, and accomplishes the
most important goal-- allow users to "buy their way in" to blocks
using transaction fees.
Handle should-never-happen case of orphan in mempool
Switch testnet3's message bytes to avoid connecting to old nodes.

The new bytes are based on "11" to appeal to Gavin's 11 fetish.

This breaks existing testnet3 nodes as the blockchain files
are also versioned.  To upgrade a node delete everything
except wallet.dat from your .bitcoin/testnet3 folder.
Merge pull request #1571 from Diapolo/optionsdialog_cleanup

GUI: optionsdialog cleanup