Merge commit 'et/master'
[libguestfs.git] / intltool-merge.in