merge
authorVolker Lendecke <vl@samba.org>
Wed, 11 Apr 2007 11:57:58 +0000 (13:57 +0200)
committerVolker Lendecke <vl@samba.org>
Wed, 11 Apr 2007 11:57:58 +0000 (13:57 +0200)

Trivial merge