Merge branch 'flash-bang-grenade' into merge-ger-into-bleeding-edge

Conflicts:
	.gitignore
	3rdparty/json/ConvertUTF.c
	3rdparty/json/ConvertUTF.h
	3rdparty/json/JSON_parser.c
	3rdparty/json/JSON_parser.h
	3rdparty/mongoose/mongoose.c
	3rdparty/mongoose/mongoose.h
	3rdparty/zlib/Makefile.am
	3rdparty/zlib/adler32.c
	3rdparty/zlib/compress.c
	3rdparty/zlib/crc32.c
	3rdparty/zlib/deflate.c
	3rdparty/zlib/example.c
	3rdparty/zlib/gzio.c
	3rdparty/zlib/inffast.c
	3rdparty/zlib/inflate.c
	3rdparty/zlib/inftrees.c
	3rdparty/zlib/minigzip.c
	3rdparty/zlib/trees.c
	3rdparty/zlib/zlib.h
	3rdparty/zlib/zutil.c
	3rdparty/zlib/zutil.h
	ChangeLog
	Makefile.am
	README
	TODO
	config.h.in
	configure.in
	documentation/Doxyfile
	documentation/Doxyfile.bfc
	documentation/Doxyfile.int
	hamsterdb.spec
	include/ham/hamsterdb.h
	include/ham/hamsterdb.hpp
	include/ham/hamsterdb_int.h
	include/ham/hamsterdb_srv.h
	include/ham/hamsterdb_stats.h
	include/ham/types.h
	samples/db1.c
	samples/db2.c
	samples/db3.c
	samples/db5.c
	samples/db6.cpp
	src/Makefile.am
	src/backend.h
	src/blob.cc
	src/blob.h
	src/btree.cc
	src/btree.h
	src/btree_check.cc
	src/btree_cursor.cc
	src/btree_cursor.h
	src/btree_enum.cc
	src/btree_erase.cc
	src/btree_find.cc
	src/btree_insert.cc
	src/btree_key.cc
	src/btree_key.h
	src/btree_stats.cc
	src/btree_stats.h
	src/cache.cc
	src/cache.h
	src/config.h
	src/cursor.h
	src/db.cc
	src/db.h
	src/device.cc
	src/device.h
	src/endianswap.h
	src/env.cc
	src/env.h
	src/error.cc
	src/error.h
	src/extkeys.cc
	src/extkeys.h
	src/freelist.cc
	src/freelist.h
	src/freelist_statistics.cc
	src/freelist_statistics.h
	src/freelist_v2.cc
	src/freelist_v2.h
	src/hamsterdb.cc
	src/internal_fwd_decl.h
	src/log.cc
	src/log.h
	src/mem.cc
	src/mem.h
	src/os.h
	src/os_posix.cc
	src/os_win32.cc
	src/page.cc
	src/page.h
	src/protocol/protocol.h
	src/remote.cc
	src/server/hamserver.cc
	src/txn.cc
	src/txn.h
	src/util.cc
	src/util.h
	src/version.h
	tools/.gitignore
	tools/Makefile.am
	tools/getopts.c
	tools/getopts.h
	tools/ham_dump.cc
	tools/ham_info.cc
	tools/ham_recover.cc
	tools/hamzilla.c
	unittests/Makefile.am
	unittests/api110.cpp
	unittests/bfc-sample.cpp
	unittests/bfc-signal.c
	unittests/bfc-testsuite.cpp
	unittests/bfc-testsuite.hpp
	unittests/blob.cpp
	unittests/btree_cursor.cpp
	unittests/btree_erase.cpp
	unittests/btree_insert.cpp
	unittests/btree_key.cpp
	unittests/cache.cpp
	unittests/check.cpp
	unittests/cppapi.cpp
	unittests/db.cpp
	unittests/device.cpp
	unittests/duplicates.cpp
	unittests/empty_sample.cpp
	unittests/endian.cpp
	unittests/env.cpp
	unittests/error.cpp
	unittests/extkeys.cpp
	unittests/filter.cpp
	unittests/freelist.cpp
	unittests/hamsterdb.cpp
	unittests/log.cpp
	unittests/main.cpp
	unittests/mem.cpp
	unittests/memtracker.cpp
	unittests/memtracker.h
	unittests/misc.cpp
	unittests/os.cpp
	unittests/os.hpp
	unittests/page.cpp
	unittests/partial.cpp
	unittests/recno.cpp
	unittests/remote.cpp
	unittests/txn.cpp
	win32/ham_dump.vcproj
	win32/msvc2005/dll.vcproj
	win32/msvc2005/hamsterdb.sln
	win32/msvc2005/lib.vcproj
	win32/msvc2005/protocol.vcproj
	win32/msvc2005/server_dll.vcproj
	win32/msvc2005/server_lib.vcproj
	win32/msvc2008/protocol.vcproj
	win32/msvc2008/server_dll.vcproj
	win32/msvc2008/server_lib.vcproj
	win32/unittests.vcproj