[libxml/f13: 7/7] Merge branch 'master' into f13

[Paul Howarth]

commit 96d90c41c1cfbd5efb7cb4b6d102681c4b65c43c
Merge: 3cea195 1fd8897
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Jun 2 19:07:03 2011 +0100

    Merge branch 'master' into f13

 libxml-1.8.17-CVE-2011-1944.patch |   35 ++++++++++++++++++++++++++++++
 libxml.spec                       |   43 +++++++++++++++++++++++++-----------
 2 files changed, 65 insertions(+), 13 deletions(-)
---