[rpc2/f12/master: 12/13] Merge branch 'f12' into el6

[Adam Goode]

commit 08f144fa4fe78f6abbd959f2eac17096751a63da
Merge: 430aaf1 40d1de0
Author: Adam Goode <adam at spicenitz.org>
Date:   Fri Jul 30 12:02:39 2010 -0400

    Merge branch 'f12' into el6
    
    Conflicts:
    	.gitignore

 .gitignore |    2 +-
 rpc2.spec  |   20 ++++++++++++++++----
 sources    |    2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)
---