-rolled in patches for http://bugzilla.opendarwin.org/show_bug.cgi?id=3945
        [PATCH] Safe merges of comments and other trivialities from KDE's kjs

        -patch by Martijn Klingens <klingens@kde.org>

        * kjs/array_instance.h:
        * kjs/array_object.cpp:
        * kjs/array_object.h:
        * kjs/bool_object.cpp:
        * kjs/bool_object.h:
        * kjs/collector.cpp:
        * kjs/collector.h:
        * kjs/completion.h:
        * kjs/context.h:
        * kjs/date_object.cpp:
        * kjs/date_object.h:
        * kjs/debugger.cpp:
        * kjs/debugger.h:
        * kjs/dtoa.h:
        * kjs/error_object.cpp:
        * kjs/error_object.h:
        * kjs/function.cpp:
        * kjs/function.h:
        * kjs/function_object.cpp:
        * kjs/function_object.h:
        * kjs/grammar.y:
        * kjs/identifier.cpp:
        * kjs/identifier.h:
        * kjs/internal.cpp:
        * kjs/internal.h:
        * kjs/interpreter.cpp:
        * kjs/interpreter.h:
        * kjs/interpreter_map.cpp:
        * kjs/interpreter_map.h:
        * kjs/lexer.cpp:
        * kjs/lexer.h:
        * kjs/list.cpp:
        * kjs/list.h:
        * kjs/lookup.cpp:
        * kjs/lookup.h:
        * kjs/math_object.cpp:
        * kjs/math_object.h:
        * kjs/nodes.cpp:
        * kjs/nodes.h:
        * kjs/nodes2string.cpp:
        * kjs/number_object.cpp:
        * kjs/number_object.h:
        * kjs/object.cpp:
        * kjs/object.h:
        * kjs/object_object.cpp:
        * kjs/object_object.h:
        * kjs/operations.cpp:
        * kjs/operations.h:
        * kjs/property_map.cpp:
        * kjs/property_map.h:
        * kjs/reference.cpp:
        * kjs/reference.h:
        * kjs/reference_list.cpp:
        * kjs/reference_list.h:
        * kjs/regexp.cpp:
        * kjs/regexp.h:
        * kjs/regexp_object.cpp:
        * kjs/regexp_object.h:
        * kjs/scope_chain.cpp:
        * kjs/scope_chain.h:
        * kjs/simple_number.h:
        * kjs/string_object.cpp:
        * kjs/string_object.h:
        * kjs/testkjs.cpp:
        * kjs/types.h:
        * kjs/ustring.cpp:
        * kjs/ustring.h:
        * kjs/value.cpp:
        * kjs/value.h:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@9768 268f45cc-cd09-0410-ab3c-d52691b4dbfc
70 files changed