Merge branch 'master' of git://git.samba.org/samba
commitba32afbface75fc13886237251e8debac7c75aa3
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Fri, 31 Jul 2009 16:17:00 +0000 (31 18:17 +0200)
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Fri, 31 Jul 2009 16:17:00 +0000 (31 18:17 +0200)
treec92053de11816bb913b7c293cd7127be6c8230e7
parentdf270cd796afe3f2b051db742b9094acf16502d9
parentb53338bb6846a431b78d7b85d4ef35281d3efa1c
Merge branch 'master' of git://git.samba.org/samba