Merge branch 'aggregateinternal'
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 00:08:09 +0000 (01:08 +0100)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 00:08:09 +0000 (01:08 +0100)
commit6ebea774c85502377681165e27093a3bd3a61f30
treeae4b25923b37a11290d2c28eae292635f7e4ce51
parente95d3bb4fd1ea131a78b09ca2710df642f74c003
parent302bb836f298c462da8e8bff7b04f1b00ded4665
Merge branch 'aggregateinternal'