Merge branch 'aggregateinternal'
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Mon, 14 Jul 2008 23:02:15 +0000 (00:02 +0100)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Mon, 14 Jul 2008 23:02:15 +0000 (00:02 +0100)
commite95d3bb4fd1ea131a78b09ca2710df642f74c003
tree25d464b55aeff93130c618dca207b696537c9e44
parenta65d312467c5ab179ecf4aa715790f371a46634a
parent50a5ab3c4e1db5beb18d86873143e7715fd5b27e
Merge branch 'aggregateinternal'