[lua-expat/el6: 3/3] Merge branch 'master' into el6

[Matej Cepl]

commit 54c770bfe4ab4d5a4a9cca8ee78fd8360aa9f126
Merge: e953ed0 73e37fb
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Jun 3 18:45:51 2011 +0200

    Merge branch 'master' into el6

 .gitignore     |    1 +
 lua-expat.spec |   19 +++++++++++++------
 sources        |    2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)
---