commit c55688eba117ef058353a6b3b2b25a35f4676fc0 Merge: a634e50 4eb05c1 Author: Simone Caronni <negativo17 at gmail.com> Date: Thu Feb 14 10:55:17 2013 +0100 Merge branch 'master' into f17 ---