Merge commit 'stable/20110609'
authorIan Beckwith <ianb@erislabs.net>
Fri, 10 Jun 2011 01:09:47 +0000 (02:09 +0100)
committerIan Beckwith <ianb@erislabs.net>
Fri, 10 Jun 2011 01:09:47 +0000 (02:09 +0100)

No differences found