commit 5232c7f9cf303514010fb585086b853b9ab1c1b4 Merge: 1b8ba86 04bb657 Author: Jon Ciesla <limb at jcomserv.net> Date: Mon Oct 25 16:53:07 2010 -0500 Merge branch 'f14' into f13 bristol-0.40.7-CVE-2010-3351.patch | 11 +++++++++++ bristol.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletions(-) ---