Merge the experimental branch, release 4.1+Debian0~exp2.
authorDidier Raboud <odyx@debian.org>
Mon, 26 Mar 2012 09:13:49 +0000 (11:13 +0200)
committerDidier Raboud <odyx@debian.org>
Mon, 26 Mar 2012 09:14:20 +0000 (11:14 +0200)
1  2 
init-functions

diff --cc init-functions
Simple merge