Index: configure.in
===================================================================
--- configure.in	(revision 1217)
+++ configure.in	(working copy)
@@ -193,6 +193,7 @@
 Tomboy/Makefile
 Tomboy/Addins/Makefile
 Tomboy/Addins/Backlinks/Makefile
+Tomboy/Addins/InsertDateTime/Makefile
 Tomboy/Addins/Tasks/Makefile
 Tomboy/Mono.Addins/Makefile
 Tomboy/Mono.Addins/Mono.Addins.Setup/Makefile
Index: Tomboy/Addins/InsertDateTime/InsertDateTimeAddin.cs
===================================================================
--- Tomboy/Addins/InsertDateTime/InsertDateTimeAddin.cs	(revision 0)
+++ Tomboy/Addins/InsertDateTime/InsertDateTimeAddin.cs	(revision 0)
@@ -0,0 +1,38 @@
+using System;
+
+using Mono.Unix;
+
+namespace Tomboy.InsertDateTime
+{
+	public class InsertDateTimeAddin : NoteAddin
+	{
+		Gtk.MenuItem item;
+		
+		public override void Initialize ()
+		{
+			item = new Gtk.MenuItem (
+					Catalog.GetString ("Insert date and time"));
+			item.Activated += OnMenuItemActivated;
+			item.Show ();
+			AddPluginMenuItem (item);
+		}
+		
+		public override void Shutdown ()
+		{
+			item.Activated -= OnMenuItemActivated;
+		}
+		
+		public override void OnNoteOpened ()
+		{
+		}
+		
+		void OnMenuItemActivated (object sender, EventArgs args)
+		{
+			string format = Catalog.GetString ("dddd, MMMM d, h:mm tt");
+			string text = DateTime.Now.ToString (format);
+			
+			Gtk.TextIter cursor = Buffer.GetIterAtMark (Buffer.InsertMark);
+			Buffer.InsertWithTagsByName (ref cursor, text, "datetime");
+		}
+	}
+}
Index: Tomboy/Addins/InsertDateTime/Makefile.am
===================================================================
--- Tomboy/Addins/InsertDateTime/Makefile.am	(revision 0)
+++ Tomboy/Addins/InsertDateTime/Makefile.am	(revision 0)
@@ -0,0 +1,39 @@
+include $(top_srcdir)/Makefile.include
+
+CSFLAGS = 		\
+	-debug 		\
+	-define:DEBUG 	\
+	-target:library
+
+ASSEMBLIES = 					\
+	$(LINK_TOMBOY_EXE)			\
+	$(TOMBOY_LIBS) 				\
+	$(LINK_MONO_ADDINS)			\
+	-r:Mono.Posix
+
+#
+# InsertDateTime Addin
+#
+
+TARGET = InsertDateTime.dll
+CSFILES = \
+	$(srcdir)/InsertDateTimeAddin.cs
+RESOURCES = \
+	-resource:$(srcdir)/InsertDateTime.addin.xml
+
+$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
+	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+
+
+addinsdir = $(pkglibdir)/addins
+addins_DATA = 			\
+	$(TARGET)
+
+EXTRA_DIST =            	\
+	$(CSFILES) \
+	$(srcdir)/InsertDateTime.addin.xml
+
+CLEANFILES =				\
+	$(TARGET).mdb \
+	$(TARGET)
+
Index: Tomboy/Addins/InsertDateTime/InsertDateTime.addin.xml
===================================================================
--- Tomboy/Addins/InsertDateTime/InsertDateTime.addin.xml	(revision 0)
+++ Tomboy/Addins/InsertDateTime/InsertDateTime.addin.xml	(revision 0)
@@ -0,0 +1,19 @@
+<Addin id="InsertDateTimeAddin"
+	namespace="Tomboy"
+	name="Insert Date/Time"
+	author="Tomboy Project"
+	description="Inserts current date and time at the cursor position."
+	version="0.1">
+
+	<Runtime>
+		<Import assembly="InsertDateTime.dll" />
+	</Runtime>
+
+	<Dependencies>
+		<Addin id="Tomboy" version="0.7" />
+	</Dependencies>
+
+	<Extension path="/Tomboy/NoteAddins">
+		<NoteAddin type="Tomboy.InsertDateTime.InsertDateTimeAddin" />
+	</Extension>
+</Addin>
Index: Tomboy/Addins/Makefile.am
===================================================================
--- Tomboy/Addins/Makefile.am	(revision 1217)
+++ Tomboy/Addins/Makefile.am	(working copy)
@@ -1,2 +1,2 @@
-SUBDIRS = Backlinks Tasks
+SUBDIRS = Backlinks Tasks InsertDateTime
 
