Merge 0.4.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 5 Jun 2008 16:49:00 +0000 (18:49 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 5 Jun 2008 16:49:00 +0000 (18:49 +0200)
commitcd52e74405940f917717d4a47ebb25aa8be5d574
treecb0141858dbdac821e42cd24305335655b44ef2d
parentaa95a9210a9ab1a19b14e1d34a69ac2668f84e95
parent6b329d0d7bd3a8c8a072f210ffaa74e6df24ab77
Merge 0.4.
branch.py