[SCM] bristol packaging branch, master, updated. debian/0.60.5-1-10-g54da2c8

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 54da2c8c60156cb13b0e1246e7ec9c69b86d675b
Merge: 8157c858218910d30e1c05eeca9247754850f037 072bd35c60f150b7b517e6deac12cd4f542c54e6
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Aug 13 16:18:57 2010 +0200

    Merge commit 'upstream/0.60.6'


-- 
bristol packaging