Merge branch 'master' of ssh://git.samba.org/data/git/samba master
authorRafal Szczesniak <mimir@samba.org>
Wed, 27 Apr 2011 05:01:38 +0000 (07:01 +0200)
committerRafal Szczesniak <mimir@samba.org>
Wed, 27 Apr 2011 05:01:38 +0000 (07:01 +0200)

Trivial merge