merged from trunk
authorCherian Mathew <c.mathew@bgbm.org>
Thu, 11 Apr 2013 15:55:44 +0000 (15:55 +0000)
committerCherian Mathew <c.mathew@bgbm.org>
Thu, 11 Apr 2013 15:55:44 +0000 (15:55 +0000)

Trivial merge