Updated messages, might be a new candidate for our boilerplate
Updated messages, might be a new candidate for our boilerplate

git-svn-id: e2acd8cf4813d3daa107259c8b70236b111f2bcf@7611 e6edf6fb-f266-4316-afb4-e53d95876a76

jonasbn/bdkfi