Merge 0.4
authorJelmer Vernooij <jelmer@samba.org>
Fri, 2 May 2008 20:25:05 +0000 (22:25 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 2 May 2008 20:25:05 +0000 (22:25 +0200)
1  2 
repository.py

diff --cc repository.py
Simple merge