Merge branch 'master' of git://git.samba.org/samba
commit0c489d9ec628ca4c3b2f496cc4ee1e94b78593f2
authorThomas Nagy <tnagy2pow10@gmail.com>
Tue, 31 Aug 2010 12:59:50 +0000 (31 14:59 +0200)
committerThomas Nagy <tnagy2pow10@gmail.com>
Tue, 31 Aug 2010 12:59:50 +0000 (31 14:59 +0200)
tree1e0e7c1a333d7fd12e6005b697bce7f5a8160988
parentef869659e6e4c23c51ff661e14aeb88852b01856
parent659829851703797b47d398d3c71ad971b2c5dab7
Merge branch 'master' of git://git.samba.org/samba