[librcc/el6: 4/5] Merge branch 'master' into el6

[ivanromanov]

commit 376247b6bedf29327a7ac87da86305913518b936
Merge: b9ab37e aafa258
Author: Ivan Romanov <drizt at land.ru>
Date:   Tue Nov 19 16:26:52 2013 +0600

    Merge branch 'master' into el6
    
    Conflicts:
    	librcc.spec

 .gitignore                |    1 +
 librcc-glib2-2.32.0.patch |   13 ----------
 librcc-rccstring.patch    |   13 ----------
 librcc.spec               |   54 ++++++++++++++++++++++++++++++++++++++++----
 sources                   |    2 +-
 5 files changed, 51 insertions(+), 32 deletions(-)
---