Hand merged
authorGabe Black <gblack@eecs.umich.edu>
Tue, 28 Feb 2006 11:17:57 +0000 (06:17 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 28 Feb 2006 11:17:57 +0000 (06:17 -0500)
commit8e6b8cb212ba79978056b57dd60c60a39f6428e9
treee0fbb23e2bac27d965fc55657d0a41f70a63305e
parentf7360d5bca61baf4539698faf08fc36113c4fb33
Hand merged

--HG--
extra : convert_revision : 0fd5ecbba5dc6299dd046926ec27595ca4d97ee7
dev/sinic.cc