Merge remote-tracking branch 'origin/master'

diff --combined .bashrc
index 20e8c48,f66ac8e..f401ff2
--- 1/.bashrc
--- 2/.bashrc
+++ b/.bashrc
@@@ -69,6 -69,8 +69,8 @@@ _bash_profile_addpath -f PAT
  _bash_profile_addpath -f PATH            "/usr/sbin"
  _bash_profile_addpath -f PATH            "/bin"
  _bash_profile_addpath -f PATH            "/usr/bin"
+ _bash_profile_addpath    PATH            "/usr/lib/ccache"
+ _bash_profile_addpath    PATH            "/usr/lib64/ccache"
  [ $EUID -eq 0 ] && _bash_profile_addpath -f PATH "/usr/local/sbin"
  _bash_profile_addpath -f PATH            "/usr/local/bin"
  _bash_profile_addpath -f MANPATH         "/usr/X11R6/man"
@@@ -366,7 -368,6 +368,7 @@@ function rpmsrclis
  function valgrind {(set -e;unset valgrind;s=~/.python.valgrind;rm -f $s;cp -p /usr/share/doc/python-devel-2.*/valgrind-python.supp $s;patch $s <$s.patch;perl -i -e 'undef $/;$_=<>;1 while s/^(?:###)?({\n)(?:###)?( *ADDRESS_IN_RANGE.*\n(?:[^}#].*\n)*)###/$1$2/gm;print;' $s;valgrind --num-callers=50 --suppressions=$s "$@";);}
  function yumupdate {(ulimit -v unlimited;yum makecache;yum -y --skip-broken update "$@";);}
  function gitcommit { git commit -a -m .; }
 +function gpg {(unset gpg; http_proxy= all_proxy= HTTP_PROXY= ALL_PROXY= gpg "$@"; );}
  
  ulimit -S -c 0
  set +H