Merge branch 'autotools' of http://www.gnome.org/~halfline/reinteract into autotools