Merged. Everyone, please note that the hg branch should have been called
"issue149", not "issue-149". Keeping this consistent will help with the
integration of hg, roundup, and rietveld.

Looks good. There's not much to comment on in terms of code review. :-)
I'll merge when I'm back in Freiburg.

Ok, done. Malte, you can pull it from my repository (branch issue-149).

I also used this issue for a first test of the reviewing tool. You find the
changes at http://codereview.appspot.com/3202041.

Well, since I did it, I will change it.

Adding Gabi to nosy since I think all throw/catch is in the option parser code.

"Throw by value, catch by reference." (=> Sutter & Alexandrescu). 
So 
   catch (ParseError e)
should be 
   catch (ParseError &e)

I opened the issue - who's going to do it?