Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Thu, 23 Apr 2009 15:38:42 +0000 (17:38 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 23 Apr 2009 15:38:42 +0000 (17:38 +0200)
commitae6af9ecbfce559a50d95853d6e66b8aa8788741
treea99a38c2dded44ab1af89d8e705d263978641f42
parentf5dfd1a9a68fda488c96176754a3b6462e8e4dba
parent176302dc05cd67d013f3d153b9816329a175167e
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel