Merge branch 'jm2/vktest' into vk/test
commit23cfe043d230aded33d9c05d88db551c50dba060
authorVolodymyr Kondratenko <vkondrat@math.ucdenver.edu>
Mon, 5 Jul 2010 20:47:09 +0000 (5 14:47 -0600)
committerVolodymyr Kondratenko <vkondrat@math.ucdenver.edu>
Mon, 5 Jul 2010 20:47:09 +0000 (5 14:47 -0600)
treef557e1408a602977e189afbd7f8ef00d9d748f01
parentab9bfd5c4bb095c08052fc9a084f3c7e1d2277a4
parent68650c98578d4a9988ed2dc024c3fd9a1e6db9ee
Merge branch 'jm2/vktest' into vk/test