Merge commit '5e95c548864bc8b075b8343e69a69e1a22c92456' into 3.2-trivial
authorJelmer Vernooij <jelmer@samba.org>
Sat, 13 Oct 2007 22:56:27 +0000 (00:56 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 13 Oct 2007 22:56:27 +0000 (00:56 +0200)
commit466925b007b17e931c9a7c753d72e48441af2dee
tree97a00cdaf3d57b61acec310b7b82782d6979838c
parentf25df89780398c40c3ae5706a2e29542e5cddbe3
parent478ad87cb39d794f596316ba24d73c24d23a159a
Merge commit '5e95c548864bc8b075b8343e69a69e1a22c92456' into 3.2-trivial
(This used to be commit f8580abbd5a90622187bbd11ab3ebed6e2d541a0)