Merge branch 'master' of git://people.freedesktop.org/~krh/razor
authorDan Winship <danw@gnome.org>
Tue, 18 Mar 2008 15:44:28 +0000 (11:44 -0400)
committerDan Winship <danw@gnome.org>
Tue, 18 Mar 2008 15:44:28 +0000 (11:44 -0400)

Trivial merge