[bristol/f12/master: 7/7] Merge branch 'f13' into f12

[Jon Ciesla]

commit a30c3ec2c3a5dd1b293deaf1a4c0be2ae27c676a
Merge: 484d7e4 5232c7f
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Oct 25 17:01:11 2010 -0500

    Merge branch 'f13' into f12
    
    Conflicts:
    	.gitignore
    	bristol.spec

 bristol-0.40.7-CVE-2010-3351.patch |   11 +++++++++++
 bristol.spec                       |    8 +++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---