From: Steve Youngs <steve@sxemacs.org>
Date: Thu, 15 Sep 2011 05:49:06 +0000 (+1000)
Subject: Merge branch 'merges'
X-Git-Tag: v22.1.15~105
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=35f53868bffe4dbf5d9ba09194ba0fdadf61d996;p=sxemacs

Merge branch 'merges'
---

35f53868bffe4dbf5d9ba09194ba0fdadf61d996