commit 2d9f24474d3e9f1ca8d06f9dc63370a6eeadf91d Merge: a1c89f8 1151a30 Author: Tim Waugh <twaugh at redhat.com> Date: Mon Aug 16 17:45:48 2010 +0100 Merge branch 'f12' into f13 patch-selinux.patch | 79 +++++++++++++++++++++++++-------------------------- patch.spec | 5 ++- 2 files changed, 43 insertions(+), 41 deletions(-) ---