Merge in shika-based!
Shawn M Moore [Tue, 9 Dec 2008 02:37:11 +0000 (02:37 +0000)]

Trivial merge