[SCM] bristol packaging branch, master, updated. debian/0.60.4-1-3-gf34410f

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f34410f05b1612a17769d32a7b904007a7602f52
Merge: e9386beae6615d23f67875adfb55074662659533 e1919b35dde76745a91f1f6be55571aead6771a4
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jun 18 09:23:25 2010 +0200

    Merge commit 'upstream/0.60.5'


-- 
bristol packaging