Merge branch 'fix-crash_on_P4' into develop
authorXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 22 Mar 2012 16:06:29 +0000 (00:06 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 22 Mar 2012 16:06:29 +0000 (00:06 +0800)

Trivial merge