Merge branch 'master' into test3
commite3fbac6587d1038c16408d5c779faf183321b81b
authorJean-loup Gailly <jloup@gailly.net>
Sat, 25 Dec 2010 10:54:40 +0000 (25 11:54 +0100)
committerJean-loup Gailly <jloup@gailly.net>
Sat, 25 Dec 2010 10:54:40 +0000 (25 11:54 +0100)
treea0026504b032348673a16d7e1732bcac4dd31f12
parentc8b94e4fd8535d7dddec56bad133d525bdc9bc2b
parenta54f0deceabd1ef9613df61153fdcb955bd32a7e
Merge branch 'master' into test3

Conflicts:
uct/internal.h
uct/walk.c
uct/internal.h
uct/policy/ucb1amaf.c
uct/uct.c
uct/walk.c