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)
commitc266595058416b4b776890dadf3ad827787f4e7e
treebfedd08b4579c33b62d42da88498b6c26088b88e
parent0bc538b08ca5c4efea86700cb6c4685da3f34345
parent1ca76031092ab07682843fd70607696f6af7216f
Merge branch 'master' into dbus-work
configure.ac
src/Makefile.am
src/daemon/main.c