Merge branch 'btor'
authorClifford Wolf <clifford@clifford.at>
Fri, 24 Jan 2014 22:44:46 +0000 (23:44 +0100)
committerClifford Wolf <clifford@clifford.at>
Fri, 24 Jan 2014 22:44:46 +0000 (23:44 +0100)

Trivial merge