[ATpy/el5: 2/3] Merge branch 'master' into el5

[Sergio Pascual]

commit b939b00bb6a78321779259418d140a3c371d292c
Merge: 71f936d 342e952
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Fri Jul 15 17:34:51 2011 +0200

    Merge branch 'master' into el5

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