[sobby/el6: 5/6] Merge remote-tracking branch 'origin/master' into el6

[Kevin Fenzi]

commit 7c8f11c329df3a0b705c666a8ce11be1d2a6407e
Merge: 64f3012 a6c004b
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Thu Nov 17 15:16:26 2011 -0700

    Merge remote-tracking branch 'origin/master' into el6

 sobby.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---