Merge branch 'kaps-included' into master
authorAndreas Zwinkau <zwinkau@kit.edu>
Fri, 8 Apr 2011 13:43:15 +0000 (15:43 +0200)
committerAndreas Zwinkau <zwinkau@kit.edu>
Fri, 8 Apr 2011 13:43:17 +0000 (15:43 +0200)

Trivial merge