Merge John.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 24 Jan 2009 17:50:34 +0000 (17:50 +0000)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 24 Jan 2009 17:50:34 +0000 (17:50 +0000)
commit1308db79ae13b6276d7443c0e95266f339536adb
treed2cff65681ad3e2c4438af1dd027cbf40df9f1cd
parent1ce1158d6a08035931a172a717e86c658a371f56
parentd035b81ea9e071fe42062f6524d84523d265295a
Merge John.