Merge commit 'origin/master'
authorJens Vollinga <jensv@balin.nikhef.nl>
Thu, 27 Mar 2008 10:16:11 +0000 (11:16 +0100)
committerJens Vollinga <jensv@balin.nikhef.nl>
Thu, 27 Mar 2008 10:16:11 +0000 (11:16 +0100)

Trivial merge