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)
commit3afedbf6f07816b8c59d7335219090defdd06f67
tree1a57b5b09223ee6992f13e92553f5f4ef21e9fc6
parentb4ec36debc4b6ad39805840cf24d0f6596a934dd
parentdff146e306e5ea8accb2463b9e35bfa83297dc01
Merge branch 'fix-crash_on_P4' into develop