From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Thu, 12 Apr 2012 08:19:56 +0000 (-0700)
Subject: Merge branch 'unstable' into clipboard
X-Git-Url: http://git.alex.org.uk

Merge branch 'unstable' into clipboard
---

f20bdc8145f2af8e7508966c0d3b6d05cc2aab60