Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit67b83d2489788f1899c253fdab554d0998f9c044
authorAndrew Tridgell <tridge@samba.org>
Thu, 28 May 2009 12:12:00 +0000 (28 22:12 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 28 May 2009 12:12:00 +0000 (28 22:12 +1000)
tree637060cb6bd4ab16fa9464d2bc168ad6c99e0b11
parent08be1420ba52ef9bba90d0f811c7810841ee8568
parente63d9c29c99c5311c9f4a8dbe432ff4cea4fb924
Merge branch 'master' of ssh://git.samba.org/data/git/samba