Merge branch 'stable'
authorKarl Hasselström <kha@treskal.com>
Wed, 23 Jul 2008 21:24:57 +0000 (23:24 +0200)
committerKarl Hasselström <kha@treskal.com>
Thu, 24 Jul 2008 19:41:09 +0000 (21:41 +0200)
commitd756053f114b1fdf46c2694e940f1197822afcc7
treef46c04d014fd4ba7427b0d0647f15ad0a9b73752
parent2e37b61d886ef21200007b57f496aaf182f42705
parentedca53204c2461fd451bf3a8bbb18e59c6260523
Merge branch 'stable'

Conflicts:

setup.py
setup.py
t/t2701-refresh-p.sh