Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 13:18:26 +0000 (15:18 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 13:18:26 +0000 (15:18 +0200)
commit78ad8fc8aa6fb50ec245f213362bc2b21ddfad84
tree1cacd5e8904e6afeef005ae7a8cdbb3612ef9059
parentca9e118d7e533be613259b8e49bd4c92e31d5274
parentb54b8912e10af2ca1f64aca8e2cc9538b39f7393
Merge branch 'master' of git://git.samba.org/samba