Merge fixes from abderrahim.
authorJelmer Vernooij <jelmer@samba.org>
Wed, 22 Jul 2009 19:04:45 +0000 (21:04 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 22 Jul 2009 19:04:45 +0000 (21:04 +0200)

Trivial merge