From: Nadezhda Ivanova <nadezhda.ivanova@postpath.com>
Date: Thu, 7 Jan 2010 10:34:06 +0000 (+0200)
Subject: Merge branch 'master' of git://git.samba.org/samba
X-Git-Tag: tdb-1.2.1~396
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=309473f938d18b9993c2c4f120eeff7b4641985a

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

309473f938d18b9993c2c4f120eeff7b4641985a