Merge with 3.2
authorKristján Valur Jónsson <sweskman@gmail.com>
Tue, 19 Mar 2013 23:34:39 +0000 (16:34 -0700)
committerKristján Valur Jónsson <sweskman@gmail.com>
Tue, 19 Mar 2013 23:34:39 +0000 (16:34 -0700)

Trivial merge