Merge trunk.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 15 Apr 2010 14:09:30 +0000 (16:09 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 15 Apr 2010 14:09:30 +0000 (16:09 +0200)

Trivial merge