Merge branch 'ft_rework'
authorCosimo Cecchi <cosimoc@gnome.org>
Mon, 1 Jun 2009 16:07:13 +0000 (18:07 +0200)
committerCosimo Cecchi <cosimoc@gnome.org>
Mon, 1 Jun 2009 16:07:13 +0000 (18:07 +0200)

Trivial merge