[SCM] routino branch, master, updated. 59f7dd29369e69f05afb4de29306d16a08197830

[Thibaut Gridel]

The following commit has been merged in the master branch:
commit 787821d2e5a4cb09032d3ad2ed47ac65d7bc6811
Merge: 0afc45ba643e3f231460315c44d3590f65f4d10b fb9657174e57b36b0427c58b4869a50b075c54b4
Author: Thibaut Gridel <tgridel at free.fr>
Date:   Wed Oct 26 18:23:37 2011 +0200

    Merge commit 'upstream/2.1.1'


-- 
Packaging for routino