From de5b64206c94a987174b087dcac9732f2ab419d8 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Wed, 15 Aug 2007 10:23:57 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

---
diff --git a/Makefile.am b/Makefile.am
index 581e0a4..7287eac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = bin data lib po shell sugar services
 
 bin_SCRIPTS = 			\
diff --git a/NEWS b/NEWS
index ed28aa3..0068c95 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Snapshot d93122bf5e
+
 * #2751 Add keybindings for max/min brightness/volume
 
 Snapshot 040c94d181
--
cgit v0.9.1