Merge remote-tracking branch 'origin/master' into chaindev
authorMichal Soltys <soltys@ziu.info>
Wed, 8 Jun 2011 11:29:38 +0000 (13:29 +0200)
committerMichal Soltys <soltys@ziu.info>
Wed, 8 Jun 2011 11:29:38 +0000 (13:29 +0200)

Trivial merge