Merge branch '0.8.x' into groupalias
authorEvan Prodromou <evan@controlyourself.ca>
Mon, 15 Jun 2009 04:53:45 +0000 (21:53 -0700)
committerEvan Prodromou <evan@controlyourself.ca>
Mon, 15 Jun 2009 04:53:45 +0000 (21:53 -0700)

Trivial merge