Merge Dhananjay's branch. master
authorJelmer Vernooij <jelmer@samba.org>
Thu, 8 Dec 2011 14:05:18 +0000 (15:05 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 8 Dec 2011 14:05:18 +0000 (15:05 +0100)

Trivial merge