Merge branch 'budget' into rh
authorNicolas Cadou <ncadou@cadou.ca>
Wed, 15 Jun 2011 01:20:10 +0000 (21:20 -0400)
committerNicolas Cadou <ncadou@cadou.ca>
Wed, 15 Jun 2011 01:20:10 +0000 (21:20 -0400)

Trivial merge