Merge branch 'master' into dbus-work
authorTanu Kaskinen <tanuk@iki.fi>
Mon, 29 Jun 2009 15:55:12 +0000 (18:55 +0300)
committerTanu Kaskinen <tanuk@iki.fi>
Mon, 29 Jun 2009 15:55:12 +0000 (18:55 +0300)
1  2 
configure.ac
src/Makefile.am
src/daemon/main.c

diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge