npgsql - Npgsql2: Redo merge.

Log Message:
-----------
Redo merge.

Modified Files:
--------------
    Npgsql2/testsuite/noninteractive/NUnit20:
        App.config (r1.2 -> r1.3)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/testsuite/noninteractive/NUnit20/App.config.diff?r1=1.2&r2=1.3)
        BaseClassTests.cs (r1.1 -> r1.2)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/testsuite/noninteractive/NUnit20/BaseClassTests.cs.diff?r1=1.1&r2=1.2)
        CommandTests.cs (r1.6 -> r1.7)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/testsuite/noninteractive/NUnit20/CommandTests.cs.diff?r1=1.6&r2=1.7)
        ConnectionTests.cs (r1.4 -> r1.5)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/testsuite/noninteractive/NUnit20/ConnectionTests.cs.diff?r1=1.4&r2=1.5)
        DataAdapterTests.cs (r1.1 -> r1.2)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/testsuite/noninteractive/NUnit20/DataAdapterTests.cs.diff?r1=1.1&r2=1.2)
        DataReaderTests.cs (r1.1 -> r1.2)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/testsuite/noninteractive/NUnit20/DataReaderTests.cs.diff?r1=1.1&r2=1.2)
        NpgsqlTests.csproj (r1.2 -> r1.3)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/testsuite/noninteractive/NUnit20/NpgsqlTests.csproj.diff?r1=1.2&r2=1.3)
    Npgsql2/testsuite/noninteractive:
        add_functions.sql (r1.2 -> r1.3)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/testsuite/noninteractive/add_functions.sql.diff?r1=1.2&r2=1.3)