Merge branch 'smaneth-devel' of ssh://git.nguyen.vg/SXSI/xpathcomp into smaneth-devel
authorSebastian Maneth <seba@sophisto.(none)>
Fri, 26 Oct 2012 15:13:25 +0000 (17:13 +0200)
committerSebastian Maneth <seba@sophisto.(none)>
Fri, 26 Oct 2012 15:13:25 +0000 (17:13 +0200)

Trivial merge