Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Thu, 23 Apr 2009 01:00:16 +0000 (11:00 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 23 Apr 2009 01:00:16 +0000 (11:00 +1000)
commit373a04d6a47a5c7cf8d822d60be1d9b9ab4df784
tree80a035839c37e6dcc9b107a62a42135908291d39
parent43c718ebd402abe2e1e6360ce21b08cc13030c88
parent6c900aa343096c5e1e297e055c36832ffa5028dd
Merge commit 'ronnie/master'