merge from 3.1.2-SNAPSHOT branch for 3.1.2 release
authorCherian Mathew <c.mathew@bgbm.org>
Mon, 3 Dec 2012 15:21:32 +0000 (15:21 +0000)
committerCherian Mathew <c.mathew@bgbm.org>
Mon, 3 Dec 2012 15:21:32 +0000 (15:21 +0000)

Trivial merge