[net6/el6: 4/4] Merge branch 'master' into el6

[Luke Macken]

commit 1dca85889dbeea54e7f105fe6c3497216cd0ed57
Merge: 08f234c 8370cbc
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Nov 2 14:51:57 2011 -0400

    Merge branch 'master' into el6

 .gitignore |    2 ++
 net6.spec  |   13 +++++++++++--
 sources    |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
---