Merge branch 'master' of git://git.samba.org/samba
commitdbd1ea2f4dfb748641a702ed029bb5ccb2b11c09
authorThomas Nagy <tnagy2pow10@gmail.com>
Tue, 31 Aug 2010 16:17:57 +0000 (31 18:17 +0200)
committerThomas Nagy <tnagy2pow10@gmail.com>
Tue, 31 Aug 2010 16:17:57 +0000 (31 18:17 +0200)
tree671f0aab8d89271ceb0fba5b80d62069ac787d3a
parent0c489d9ec628ca4c3b2f496cc4ee1e94b78593f2
parent5648c3f67eeebee0a17cf9e7b64fb2cbfe2e2e68
Merge branch 'master' of git://git.samba.org/samba