merge trivial fixes from Abderrahim.
authorJelmer Vernooij <jelmer@samba.org>
Wed, 29 Jul 2009 14:25:42 +0000 (16:25 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 29 Jul 2009 14:25:42 +0000 (16:25 +0200)

Trivial merge