Merge branch 'merges'
authorSteve Youngs <steve@sxemacs.org>
Thu, 16 Jun 2011 02:36:55 +0000 (12:36 +1000)
committerSteve Youngs <steve@sxemacs.org>
Thu, 16 Jun 2011 02:36:55 +0000 (12:36 +1000)
commitbce364853e3a9dfc411584dfd9a7ca1d92550557
treeaf9e459a23944eff0416488e9f263412107d020c
parentad9e2b4f262ca555dc96b5f473a4f55709ad620c
parent40098fccc15a565a136d36219d44c22ebbb0af44
Merge branch 'merges'