[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-609-g864144f

The branch, v3-4-test has been updated
       via  864144fc82d49e228a4e1c49dfaf004ba19d1088 (commit)
       via  ee729830b872f1cb760ad91b808bf200bc34773d (commit)
      from  23876eba5f22b5953339b23bf25262d53acce994 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test

- Log -----------------------------------------------------------------
commit 864144fc82d49e228a4e1c49dfaf004ba19d1088
Merge: ee729830b872f1cb760ad91b808bf200bc34773d 23876eba5f22b5953339b23bf25262d53acce994
Author: Jeremy Allison <jra <at> samba.org>
Date:   Tue Mar 31 18:30:27 2009 -0700

    Merge branch 'v3-4-test' of ssh://jra <at> git.samba.org/data/git/samba into v3-4-test

commit ee729830b872f1cb760ad91b808bf200bc34773d
Author: Jeremy Allison <jra <at> samba.org>
Date:   Tue Mar 31 18:28:49 2009 -0700

    Tidy up some convert_string_internal error cases, found by Andrew Bartlett.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/charcnv.c |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

Changeset truncated at 500 lines: