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)
commitf8580abbd5a90622187bbd11ab3ebed6e2d541a0
tree711afce596730d602eb7e4e4d8aad656fdd2d7d3
parent84660aaab02338f22669bdf20af0f98607b6db17
parent5e95c548864bc8b075b8343e69a69e1a22c92456
Merge commit '5e95c548864bc8b075b8343e69a69e1a22c92456' into 3.2-trivial