Merge commit 'pan/master' into not-linux
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 14 Oct 2008 22:28:35 +0000 (00:28 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 14 Oct 2008 22:28:35 +0000 (00:28 +0200)
commit785558696ffa16453be0b5b565c46b6426126d1e
treea4d9f097281bf0d77d9439f19c34345b3776ce07
parentf78d6baee60179e6ce41cc7058a8df5857116010
parentc6c35d88944e43bce8b17cef7e8d6914a56eec23
Merge commit 'pan/master' into not-linux

Conflicts:
postlicyd/filter.c
postlicyd/main-postlicyd.c

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
mk/common.mk
postlicyd/Makefile
postlicyd/filter.c
postlicyd/main-postlicyd.c