Merge heads.
authorAlexandre Vassalotti <alexandre@peadrop.com>
Sun, 14 Apr 2013 09:10:14 +0000 (02:10 -0700)
committerAlexandre Vassalotti <alexandre@peadrop.com>
Sun, 14 Apr 2013 09:10:14 +0000 (02:10 -0700)

Trivial merge