Merge branch 'issue-860'
commitf081cad42c397503d2f1997913bb6d7e77cc300b
authorSven Strickroth <email@cs-ware.de>
Tue, 23 Aug 2011 21:39:02 +0000 (23 23:39 +0200)
committerSven Strickroth <email@cs-ware.de>
Tue, 23 Aug 2011 21:39:02 +0000 (23 23:39 +0200)
treee4140dd9796795b78593ec403d2e0e52aa6e3a69
parentc8cc40cb46d81f1ac31288119a96df222cd62dfb
parentde95ddf1c52306a739d7e8a5460a53fb51d27310
Merge branch 'issue-860'

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