multani/sonata — pull request #9 by onto (2012-03-17 21:10:32+00:00)
Title: Integration

Hello, I reorganized all my commits.

Can you inspect and if they match then pull)