From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 10 Jun 2011 18:08:51 +0000 (+0300)
Subject: Merge branch 'io-master'
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c7afef88380ebebc8c2b04e48664d73281ec8848;hp=c7afef88380ebebc8c2b04e48664d73281ec8848;p=libs%2Fcore.git

Merge branch 'io-master'

Conflicts:
	.gitignore
	Build
	Changelog.txt
---