[net6/el5: 15/15] Merge branch 'master' into el5

[Luke Macken]

commit ce3e423379ebcdd5402f3641cfad6e369112bb9b
Merge: ec55474 8370cbc
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Nov 2 14:53:01 2011 -0400

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	net6.spec
    	sources

 .gitignore |    4 +++-
 net6.spec  |   34 ++++++++++++++++++++++++++++++++--
 sources    |    2 +-
 3 files changed, 36 insertions(+), 4 deletions(-)
---