Merge branch '4-0-stable' into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 11:54:01 +0000 (21:54 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 11:54:01 +0000 (21:54 +1000)
commit857df6e91874407f70436749e3dad13ada003e6e
tree3781f2d67933e65b5b254e95c5e388776885cd5a
parent6459adb6ac2bf94a1e60c1450dbef43360f30888
parent74e95269fcded3454253452802f404d529508ce5
Merge branch '4-0-stable' into 4-0-local