commit 1d0e8b8f0f918789c125526e3e1f409eea4d411b Merge: 55aff2f 9d8e087 Author: Jerry James <loganjerry at gmail.com> Date: Mon Aug 16 15:16:10 2010 -0600 Merge branch 'master' into f13 sphinxbase.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---