From: Jon A. Cruz <jon@joncruz.org>
Date: Sun, 19 Dec 2010 18:08:27 +0000 (-0800)
Subject: Merge from trunk.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8680124aec2da49c3e34695c68840387511f78bf;p=inkscape.git

Merge from trunk.
---

8680124aec2da49c3e34695c68840387511f78bf