Merge branch 'slatez-applets'
authorJonny Lamb <jonnylamb@gnome.org>
Tue, 20 Oct 2009 13:00:51 +0000 (14:00 +0100)
committerJonny Lamb <jonnylamb@gnome.org>
Tue, 20 Oct 2009 13:00:51 +0000 (14:00 +0100)
commit105cc83e67ef41c35998aaaaae8bf18c56be65c0
tree03a20a791ba481ddb65f34e1a4a1777b7d534d25
parent6496713f0997ab90e7ee686819640b22b4911aea
parentda500948288ec5e9e675502151e5305bdf063592
Merge branch 'slatez-applets'

Conflicts:
Makefile.am
configure.ac

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Makefile.am
configure.ac