pidgin/quail/quail

Fix merge
soc.2013.phil.quail
2013-06-14, Phil Hannent
c68ccfc3da60
Fix merge