From: Jon A. Cruz <jon@joncruz.org>
Date: Sat, 18 Dec 2010 06:03:56 +0000 (-0800)
Subject: Merge from trunk.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c580a96092327174256078a5ca30582608e82be7;p=inkscape.git

Merge from trunk.
---

c580a96092327174256078a5ca30582608e82be7