grim/guifications3

merging

2011-05-16, Gary Kramlich
8e6f170cb062
merging
SUBDIRS=po prefedit
EXTRA_DIST=\
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
po/ChangeLog