From: Jon A. Cruz <jon@joncruz.org>
Date: Sun, 19 Dec 2010 06:59:26 +0000 (-0800)
Subject: Set merge from trunk
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3e058c7c1d6bcf2db4e26037daa5442e70b3df52;p=inkscape.git

Set merge from trunk
---

3e058c7c1d6bcf2db4e26037daa5442e70b3df52