Merge commit '90fcc2f' into unstable

Conflicts:
	p2pool/main.py

diff --cc p2pool/main.py
index ad1d5b5,0601879..ceb3762
--- 1/p2pool/main.py
--- 2/p2pool/main.py
+++ b/p2pool/main.py
@@@ -395,7 -375,7 +395,7 @@@ def main(args)
                  block_target=state['target'],
                  net=args.net,
              )
-             print 'Generating! Difficulty: %.06f Payout if block: %.6f %s' % (0xffff*2**208/p2pool.coinbase_type.unpack(generate_tx['tx_ins'][0]['script'])['share_data']['target'], generate_tx['tx_outs'][-1]['value']*1e-8, args.net.BITCOIN_SYMBOL)
 -            print 'New base for worker. Difficulty: %.06f Payout if block: %.6f BTC' % (0xffff*2**208/p2pool.coinbase_type.unpack(generate_tx['tx_ins'][0]['script'])['share_data']['target'], generate_tx['tx_outs'][-1]['value']*1e-8)
++            print 'New work for worker! Difficulty: %.06f Payout if block: %.6f %s' % (0xffff*2**208/p2pool.coinbase_type.unpack(generate_tx['tx_ins'][0]['script'])['share_data']['target'], generate_tx['tx_outs'][-1]['value']*1e-8, args.net.BITCOIN_SYMBOL)
              #print 'Target: %x' % (p2pool.coinbase_type.unpack(generate_tx['tx_ins'][0]['script'])['share_data']['target'],)
              #, have', shares.count(my_script) - 2, 'share(s) in the current chain. Fee:', sum(tx.value_in - tx.value_out for tx in extra_txs)/100000000
              transactions = [generate_tx] + [tx.tx for tx in extra_txs]

diff --cc p2pool/p2p.py
Simple merge