[analitza/f18: 8/8] Merge branch 'master' into f18

[Than Ngo]

commit 46d0d009044aba5999609b266b799e32e998d78c
Merge: 182ead7 46b39ac
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 12:30:58 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	analitza.spec
    	sources

 .gitignore    |    7 +------
 analitza.spec |   27 +++++++++++++++++++++++----
 sources       |    2 +-
 3 files changed, 25 insertions(+), 11 deletions(-)
---