Merge changes from 4.1
authorRaphael Hertzog <raphael@freexian.com>
Tue, 8 Jun 2010 13:49:10 +0000 (13:49 +0000)
committerRaphael Hertzog <raphael@freexian.com>
Tue, 8 Jun 2010 13:49:10 +0000 (13:49 +0000)
commit21ba146fe010a0cd438a0723732908a9e9616974
tree865ede6e20726c48941b9e5525162359ec2ceb2f
parent8013487ce626d426aef6e07e95f80a282c625cf5
Merge changes from 4.1
bin/slim-monitor
debian/changelog