Merge r7061 from nihvivo-rel-1.2-maint

This commit is contained in:
rjy7 2011-01-17 01:31:02 +00:00
parent 4aa1aebd3a
commit 5731e19a43