[ayttm/f13: 6/6] Merge branch 'master' into f13

[Minto Joseph]

commit fb58a2bd032b441314ae7e5448914b79016271a6
Merge: e1d4a05 a82b077
Author: mintojoseph <mvaliyav at redhat.com>
Date:   Wed May 18 15:49:20 2011 +0530

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	ayttm.spec
    	sources
    
    	modified:   .gitignore
    	modified:   ayttm.spec
    	modified:   sources

 .gitignore |    4 ++++
 ayttm.spec |   10 ++++++++--
 sources    |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 296c93d,8407b7b..60719aa
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  ayttm-0.6.2.tar.bz2
++<<<<<<< HEAD
++=======
+ /ayttm-0.6.3.tar.bz2
++>>>>>>> master