Committed this to CVS, albeit under misc.