merge mainline into crypto

author Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>

Sat, 5 Dec 2009 15:34:27 +0000 (16:34 +0100)

committer Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>

Sat, 5 Dec 2009 15:34:27 +0000 (16:34 +0100)
author Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 5 Dec 2009 15:34:27 +0000 (16:34 +0100)
committer Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 5 Dec 2009 15:34:27 +0000 (16:34 +0100)
diff --cc .bzrignore
Simple merge
diff --cc conf/any-emu.rmk
Simple merge
diff --cc conf/common.rmk
Simple merge
author	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Sat, 5 Dec 2009 15:34:27 +0000 (16:34 +0100)
committer	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Sat, 5 Dec 2009 15:34:27 +0000 (16:34 +0100)
		1	2
.bzrignore	patch \|	diff1 \|	diff2 \|	blob \| history
conf/any-emu.rmk	patch \|	diff1 \|	diff2 \|	blob \| history
conf/common.rmk	patch \|	diff1 \|	diff2 \|	blob \| history