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

Trivial merge