backport commit fcdbafd0c86fdba0830c
Merge pull request #28 from phi-gamma/texlive2011

backport commit fcdbafd0c86fdba0830c