reintegrating into trunk from 3.1.4-SNAPSHOT branch
authorCherian Mathew <c.mathew@bgbm.org>
Thu, 11 Apr 2013 14:48:32 +0000 (14:48 +0000)
committerCherian Mathew <c.mathew@bgbm.org>
Thu, 11 Apr 2013 14:48:32 +0000 (14:48 +0000)

Trivial merge