Merge branch 'master' into chaindev
authorMichal Soltys <soltys@ziu.info>
Thu, 30 Dec 2010 07:48:35 +0000 (08:48 +0100)
committerMichal Soltys <soltys@ziu.info>
Thu, 30 Dec 2010 07:48:35 +0000 (08:48 +0100)

Trivial merge