Merge tag 'upstream/0.16'
authorIan Beckwith <ianb@erislabs.net>
Sun, 10 Jun 2012 22:37:15 +0000 (23:37 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sun, 10 Jun 2012 22:37:15 +0000 (23:37 +0100)
Upstream version 0.16


Trivial merge