merge with master
[framework/system/libhaptic.git] / debian /
2013-03-15 Jinkun Jangmerge with master