Merge branch 'master' into chaindev
authorMichal Soltys <soltys@ziu.info>
Tue, 28 Sep 2010 10:50:32 +0000 (12:50 +0200)
committerMichal Soltys <soltys@ziu.info>
Tue, 28 Sep 2010 10:50:32 +0000 (12:50 +0200)

Trivial merge