Merge branch 'master' into cmake

Conflicts:
	src/plfs.h.in
	tests/Makefile.am
fixed double declaration of virtual destructors
Merge pull request #199 from agtorre/2.4dev

fixed double declaration of virtual destructors
Cleaned up build warnings.
Merge pull request #201 from johnbent/mlog_wrapper

Cleaned up build warnings.
Fixed Cmake to build on Crays, did some cleanup
Merge branch '2.4dev' of github.com:plfs/plfs-core into 2.4dev
Merge pull request #202 from agtorre/2.4dev

fixed cmake for crays
There was a bug where the mlog_oss was always setting noLog to false.
Therefore it was never actually providing any value.  :)

Also, added an mlog_oss::commit() to remove one unnecessary call
to oss.string().c_string() when the noLog was true.
Merge pull request #203 from johnbent/mlog_wrapper

There was a bug where the mlog_oss was always setting noLog to false.
Merge branch 'master' of github.com:plfs/plfs-core into 2.4dev
Merge pull request #205 from agtorre/2.4dev

Pulling in changes to master GLibIOStore
import files from iosbranches branch (not currently linked into
cmake build mechanism yet...)
Merge branch '2.4dev' of github.com:plfs/plfs-core into 2.4dev
add cmake glue to make pvfs/hdfs compile
Added enable-plfs-stats if we want to turn collection of stats on
Merge pull request #207 from agtorre/2.4dev

Added enable-plfs-stats if we want to turn collection of stats on
Merge branch '2.4dev' of github.com:plfs/plfs-core into cmake

Conflicts:
	CMakeLists.txt
	src/plfs_private.cpp