Merge branch 'master' of git://git.samba.org/samba
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Sun, 20 Sep 2009 22:03:42 +0000 (00:03 +0200)
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Sun, 20 Sep 2009 22:03:42 +0000 (00:03 +0200)

Trivial merge