Merge remote branch 'origin/boost-test' into master-merge-boost-test
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 24 Feb 2010 19:33:05 +0000 (20:33 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 24 Feb 2010 19:33:05 +0000 (20:33 +0100)

Trivial merge