Merge branch 'master' into mr-intg
Zachary Stevens [Sun, 8 Nov 2009 22:17:14 +0000 (22:17 +0000)]
Conflicts:
t/01app.t


Trivial merge