Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 8 Jan 2009 11:27:52 +0000 (12:27 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 8 Jan 2009 11:27:52 +0000 (12:27 +0100)
commit3318204d294f3b3ac3409f192edc3eddeada245b
tree442f52cc0c9bae0378c228c85166bcd005e60336
parentba5d6e6d706ebf07640ee24d701255cbb4803525
parent3dde0cbb769b92d922be13677ad076cae9b6a693
Merge branch 'master' of ssh://git.samba.org/data/git/samba