Bleh.

Ok, so I updated from CVS again. Things may be broken.
Bear with me.

Tags: