Merge branch 'master' into chaindev
authorMichal Soltys <soltys@ziu.info>
Mon, 14 Feb 2011 12:56:40 +0000 (13:56 +0100)
committerMichal Soltys <soltys@ziu.info>
Mon, 14 Feb 2011 12:56:40 +0000 (13:56 +0100)

Trivial merge