Merge remote branch 'origin/wip_gcov'

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/mds/MDS.cc
Simple merge

diff --cc src/mon/MDSMonitor.cc
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge