merging from trunk
authorCherian Mathew <c.mathew@bgbm.org>
Wed, 17 Apr 2013 11:26:38 +0000 (11:26 +0000)
committerCherian Mathew <c.mathew@bgbm.org>
Wed, 17 Apr 2013 11:26:38 +0000 (11:26 +0000)

Trivial merge