Merge branch 'disklibdev' into chaindev
authorMichal Soltys <soltys@ziu.info>
Mon, 11 Oct 2010 22:39:21 +0000 (00:39 +0200)
committerMichal Soltys <soltys@ziu.info>
Mon, 11 Oct 2010 22:39:21 +0000 (00:39 +0200)

Trivial merge