Merge commit '3.20110715' into prv/po
[ikiwiki] / doc / users / jelmer.mdwn
1 [Jelmer Vernooij](http://samba.org/~jelmer/)