Merge upstream.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 15 Nov 2007 22:07:22 +0000 (23:07 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 15 Nov 2007 22:07:22 +0000 (23:07 +0100)
1  2 
repository.py

diff --cc repository.py
Simple merge