merging from snapshot branch
authorCherian Mathew <c.mathew@bgbm.org>
Mon, 1 Jul 2013 08:17:10 +0000 (08:17 +0000)
committerCherian Mathew <c.mathew@bgbm.org>
Mon, 1 Jul 2013 08:17:10 +0000 (08:17 +0000)

Trivial merge