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)
commit00bf514449d4a7910d327c6af54512f681d7e5b6
tree1aee1816966c5a4b7d080b1e304b5a375632aaa8
parent3d8d629ed073eedba5a440fd00f61698e80f1809
parent72761638de4566758045d203f780d8ffc455b3d1
Merge Dhananjay's branch.