Merge branch 'boost-test' into glibc-upgrade
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 24 Feb 2010 19:54:02 +0000 (20:54 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 24 Feb 2010 19:54:02 +0000 (20:54 +0100)
commit0bd1e98c45380c137db994e106778c944151226b
treebda8f3cd230bcc2de35cf57add1dc74904cbaa5f
parent03885aedbc7832d5764664f2db0f3750e46b34fe
parent90d2deaf01bafe1a19eb29b426a95fd12343f6d0
Merge branch 'boost-test' into glibc-upgrade

Conflicts:
connd/configure.in
libi2ncommon/test/test_cron_interval.cpp
libi2ncommon/test/test_cron_point.cpp
packages/cppunit/cppunit.spec
packages/libt2n/libt2n-0.5.tar.gz
packages/libt2n/libt2n.spec
proxylizer/config.h.in
test/test_cron_interval.cpp
test/test_cron_point.cpp