Merge ../bs
authorIan Lynagh <ian@well-typed.com>
Thu, 13 Dec 2012 21:57:59 +0000 (21:57 +0000)
committerIan Lynagh <ian@well-typed.com>
Thu, 13 Dec 2012 21:57:59 +0000 (21:57 +0000)

Trivial merge