Commit dde91c5484e045882198d656fcfda7e9c11d7858

Peter Rosin 2012-02-01T16:28:48

Merge branch 'maint'