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