Merge branch 'aggregateinternal'
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 01:05:25 +0000 (02:05 +0100)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 01:05:25 +0000 (02:05 +0100)
commitd3008b626ea6130d3b75662725f6f2c412fc71ea
tree8871107c22fadcf3f1ffa7d20e1d9894ce05a0d6
parent2df8696b5f234095a89182e53279fb6c61258711
parentee16eae1662f6443898440468b5d1c39e5c3a09a
Merge branch 'aggregateinternal'