Clone
Christian Sadilek
committed
on 30 Jun 11
merged mike's changes
master + 29 more