Merge branch 'merges'
authorSteve Youngs <steve@sxemacs.org>
Tue, 21 Jun 2011 02:13:11 +0000 (12:13 +1000)
committerSteve Youngs <steve@sxemacs.org>
Tue, 21 Jun 2011 02:13:11 +0000 (12:13 +1000)
commit2b75e747e04aa8feab4018b3dc2e691229ec9ca8
tree6ff3bc07089d4af7735c51518879b406259a2517
parentbce364853e3a9dfc411584dfd9a7ca1d92550557
parent5a94101323ed5f2cdba8ce69c4e8a7fccf4bbc57
Merge branch 'merges'