From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 20 Mar 2006 17:47:40 +0000 (-0500)
Subject: Merge branch 'master'
X-Git-Tag: v2.6.19-rc1~32^2~253
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=9a21247181d93fdf99255911845ecdb041d21583

Merge branch 'master'
---

9a21247181d93fdf99255911845ecdb041d21583