Merge branch 'master' into test_aggregate
Florian Ragwitz [Fri, 5 Sep 2008 15:46:25 +0000 (15:46 +0000)]

Trivial merge