Merge branch 'decomposetransfix' of https://github.com/laanwj/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 6 Feb 2012 19:50:59 +0000 (14:50 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 6 Feb 2012 19:50:59 +0000 (14:50 -0500)

Trivial merge