pick up modifications from gcin 2.8

https://github.com/czchen/debian-gcin/commit/1bb7f2c3a683ff9043afd958c98fba5c8a3a6441