diff --git a/lib/kbd/arabic.kmap b/lib/kbd/arabic.kmap
new file mode 100644
index 0000000000..937b8b913d
--- /dev/null
+++ b/lib/kbd/arabic.kmap
@@ -0,0 +1,74 @@
+#
+# Arabic keyboard definition for LyX
+#
+# Generated automatically from kikbd map by Adil Alsaid <alsaid@bigfoot.com>
+#
+
+\kmap q Ö
+\kmap w Õ
+\kmap e Ë
+\kmap r â
+\kmap t á
+\kmap y Ú
+\kmap u Ù
+\kmap i ç
+\kmap o Î
+\kmap p Í
+\kmap a Ô
+\kmap s Ó
+\kmap d ê
+\kmap f È
+\kmap g ä
+\kmap h Ç
+\kmap j Ê
+\kmap k æ
+\kmap l å
+\kmap z Æ
+\kmap x Á
+\kmap c Ä
+\kmap v Ñ
+\kmap b ¡
+\kmap n é
+\kmap m É
+\kmap ; ã
+\kmap ' ×
+\kmap "," è
+\kmap . Ò
+\kmap / Ø
+\kmap ` ;
+\kmap ` Ð
+\kmap [ Ì
+\kmap ] Ï
+
+\kmap Q «
+\kmap W ¨
+\kmap E ¬
+\kmap R ©
+\kmap T ¤
+\kmap Y Å
+\kmap U º
+\kmap I ç
+\kmap O Î
+\kmap P »
+\kmap A ­
+\kmap S ª
+\kmap D [
+\kmap F ]
+\kmap G £
+\kmap H Ã
+\kmap J à
+\kmap K º
+\kmap L /
+\kmap Z ®
+\kmap X ¯
+\kmap C {
+\kmap V }
+\kmap B ¢
+\kmap N Â
+\kmap M º
+\kmap < ","
+\kmap > .
+\kmap ? ¿
+\kmap ~ Ð
+\kmap { <
+\kmap } >
diff --git a/src/tracer.C b/src/tracer.C
new file mode 100644
index 0000000000..8f7562376d
--- /dev/null
+++ b/src/tracer.C
@@ -0,0 +1,5 @@
+#include <config.h>
+
+#include "tracer.h"
+
+int DebugTracer::depth = 0;
diff --git a/src/tracer.h b/src/tracer.h
new file mode 100644
index 0000000000..47c13f0944
--- /dev/null
+++ b/src/tracer.h
@@ -0,0 +1,23 @@
+#ifndef TRACER_H
+#define TRACER_H
+
+#include "debug.h"
+#include "LString.h"
+
+class DebugTracer {
+public:
+	DebugTracer(string const & s) : str(s) {
+		lyxerr << string(depth, ' ') << "Trace begin : " << str << endl;
+		++depth;
+		
+	}
+	~DebugTracer() {
+		--depth;
+		lyxerr << string(depth, ' ') << "Trace end : " << str << endl;
+	}
+private:
+	string str;
+	static int depth;
+};
+
+#endif