[rpc2/f12/master: 13/13] Merge branches 'f12', 'f13', 'f14' and 'el6'

[Adam Goode]

commit f485b81a9d86cfa71e95fbe936f6084a7e13096c
Merge: a790705 1e3941f 08f144f
Author: Adam Goode <adam at spicenitz.org>
Date:   Fri Jul 30 12:03:04 2010 -0400

    Merge branches 'f12', 'f13', 'f14' and 'el6'

---