Merge commit 'origin/tzork/pathlib'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 22 Apr 2010 19:24:21 +0000 (21:24 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 22 Apr 2010 19:24:21 +0000 (21:24 +0200)

Trivial merge