[R-XML/f15: 2/2] Merge branch 'master' into f15

[Pierre-YvesChibon]

commit c2eda68c2be56a89b565984c07dd8be46b941039
Merge: 4854f29 d5bddcd
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Nov 3 09:52:17 2011 +0100

    Merge branch 'master' into f15

 .gitignore |    1 +
 R-XML.spec |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---