small fixes for cmake merge

[Peter Kümmel]

Here I need attached patch to compile
cmake and merged files. Could it go in?

Peter

Index: src/insets/InsetInclude.cpp
===================================================================
--- src/insets/InsetInclude.cpp (revision 18495)
+++ src/insets/InsetInclude.cpp (working copy)
@@ -233,7 +233,7 @@
 bool isInputOrInclude(InsetCommandParams const & params) 
 {
        Types const t = type(params);
-       return (t == INPUT) or (t == INCLUDE);
+       return (t == INPUT) || (t == INCLUDE);
 }
 
 
Index: src/frontends/qt4/QDocument.cpp
===================================================================
--- src/frontends/qt4/QDocument.cpp     (revision 18495)
+++ src/frontends/qt4/QDocument.cpp     (working copy)
@@ -891,7 +891,7 @@
        params.quotes_language = lga;
 
        int const pos = langModule->languageCO->currentIndex();
-       params.language = languages.getLanguage(lang_[pos]);
+       params.language = ::lyx::languages.getLanguage(lang_[pos]);
 
        // numbering
        if (params.getTextClass().hasTocLevels()) {