commit 5c41619e6546f717a1f2419b062056cceac9e3a6 Merge: 2b7eef0 f468c49 Author: Peter Robinson <pbrobinson at gmail.com> Date: Tue Oct 11 10:21:32 2011 +0100 fix merge .gitignore | 1 + anerley.spec | 77 ++++++++++++++++++++++++++++++---------------------------- 2 files changed, 41 insertions(+), 37 deletions(-) ---