commit 9f517f117d9d4efeb0e1366170b23c2d64ab71da Merge: 2ed22cf 678896f Author: Paul Wouters <pwouters at redhat.com> Date: Mon Jul 2 22:37:55 2012 -0400 Merge branch 'f17' of ssh://pkgs.fedoraproject.org/xl2tpd into f17 ---