Merge commit 'origin/tzork/pathlib' into divVerent/bastet
authorRudolf Polzer <divverent@alientrap.org>
Thu, 22 Apr 2010 18:35:20 +0000 (20:35 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 22 Apr 2010 18:35:20 +0000 (20:35 +0200)

Trivial merge