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)
commit02141c6718553ad9bf05afee05e1ef834d3bdd62
tree43fcaad36408a612898ad681133f14bd085c15e3
parentc1dd662a2d2c94b19e431750ddc9109b5509e3b6
parent2a98cb3d4f7222097b4ec2f5343244d1b313eac1
Merge branch 'butterfly-conference-misc'