[libHX/f13/master: 6/6] Merge branch 'master' into f13

[Till Maas]

commit 449711b6e2b734f02ac5d1b1507307b5b7b28a22
Merge: 8ca3121 bc7479f
Author: Till Maas <opensource at till.name>
Date:   Mon Aug 16 21:12:58 2010 +0200

    Merge branch 'master' into f13

---