[master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

 commit.

configure.ac

@@ -232,7 +232,7 @@ AM_CONDITIONAL(SET_ENV_LIBRARY_PATH, test $SET_ENV_LIBRARY_PATH = yes)
 AC_SUBST(SET_ENV_LIBRARY_PATH)
 AC_SUBST(ENV_LIBRARY_PATH)
 
-m4_define([_AM_PYTHON_INTERPRETER_LIST], [python python3.2 python3.1 python3])
+m4_define([_AM_PYTHON_INTERPRETER_LIST], [python python3.3 python3.2 python3.1 python3])
 AC_ARG_WITH([pythonpath],
 AC_HELP_STRING([--with-pythonpath=PATH],
   [specify an absolute path to python executable when automatic version check (incorrectly) fails]),

src/lib/datasrc/sqlite3_accessor_link.cc

@@ -47,12 +47,12 @@ checkConfig(ConstElementPtr config, ElementPtr errors) {
     bool result = true;
 
     if (!config || config->getType() != Element::map) {
-        addError(errors, "Base config for SQlite3 backend must be a map");
+        addError(errors, "Base config for SQLite3 backend must be a map");
         result = false;
     } else {
         if (!config->contains(CONFIG_ITEM_DATABASE_FILE)) {
             addError(errors,
-                     "Config for SQlite3 backend does not contain a '" +
+                     "Config for SQLite3 backend does not contain a '" +
                      string(CONFIG_ITEM_DATABASE_FILE) +
                      "' value");
             result = false;
@@ -89,11 +89,11 @@ createInstance(isc::data::ConstElementPtr config, std::string& error) {
             new SQLite3Accessor(dbfile, "IN")); // XXX: avoid hardcode RR class
         return (new DatabaseClient(isc::dns::RRClass::IN(), sqlite3_accessor));
     } catch (const std::exception& exc) {
-        error = std::string("Error creating sqlite3 datasource: ") +
+        error = std::string("Error creating SQLite3 datasource: ") +
             exc.what();
         return (NULL);
     } catch (...) {
-        error = std::string("Error creating sqlite3 datasource, "
+        error = std::string("Error creating SQLite3 datasource, "
                             "unknown exception");
         return (NULL);
     }