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

Trivial merge