[ayttm/f14: 4/4] Merge branch 'master' into f14

[Minto Joseph]

commit 128714b3a6df1fcc6a7a2a593ad6bd1ef8e8969c
Merge: a611cb7 a82b077
Author: mintojoseph <mvaliyav at redhat.com>
Date:   Tue May 17 16:42:31 2011 +0530

    Merge branch 'master' into f14

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---