Merge branch 'issue-1043'
commita30f0e4272a6af2dbffd21bb091bae4e8980d52e
authorSven Strickroth <email@cs-ware.de>
Tue, 17 Jan 2012 19:21:37 +0000 (17 20:21 +0100)
committerSven Strickroth <email@cs-ware.de>
Tue, 17 Jan 2012 19:21:37 +0000 (17 20:21 +0100)
treeac2ee033fcfea6bb08536eb4515f6cd156eeea97
parent8e1436ae2ce52b5b4db9100358c14a4f84149b9a
parent72408d9689fd846754a27e90eae40e5cde5c24ee
Merge branch 'issue-1043'

Signed-off-by: Sven Strickroth <email@cs-ware.de>