From: Dana Jansens <danakj@orodu.net>
Date: Sun, 13 May 2007 00:20:46 +0000 (+0000)
Subject: merge r6415-6416 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~63
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=f5238ed626ff498cbcefd951366c7f47b20c74a8;p=dana%2Fopenbox.git

merge r6415-6416 from trunk
---

diff --git a/Makefile.am b/Makefile.am
index 6e4e87de..373f78b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -375,6 +375,7 @@ dist_xsessions_DATA = \
 dist_noinst_DATA = \
 	debian/changelog.in \
 	debian/compat \
+	debian/conffiles \
 	debian/control \
 	debian/copyright \
 	debian/menu \