Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work

INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../mySTL

bin_PROGRAMS = test

noinst_PROGRAMS = test

test_SOURCES = test.cpp

test_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la

test_CXXFLAGS = -DYASSL_PURE_C

INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../taocrypt/include -I$(srcdir)/../taocrypt/mySTL

bin_PROGRAMS       = testsuite

noinst_PROGRAMS       = testsuite

testsuite_SOURCES  = testsuite.cpp ../taocrypt/test/test.cpp \

	../examples/client/client.cpp ../examples/server/server.cpp \

	../examples/echoclient/echoclient.cpp \