From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 16 Dec 2008 20:17:54 +0000 (+1100)
Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba
X-Git-Tag: 3.4.0-ctdb-2~2162
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3;p=obnox%2Fsamba-ctdb.git

Merge branch 'master' of ssh://git.samba.org/data/git/samba
---

1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3