Plain Diff
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-topush mysys/string.c: Auto merged