Merge branch 'butterfly-conference-misc'
authorJonny Lamb <jonnylamb@gnome.org>
Thu, 11 Mar 2010 11:35:45 +0000 (11:35 +0000)
committerJonny Lamb <jonnylamb@gnome.org>
Thu, 11 Mar 2010 11:35:45 +0000 (11:35 +0000)

Trivial merge