Checkout
stefan2
committed
on 02 Jan 15
Merge branches/fsx-id in /trunk, remove the BRANCH-README and
resolve trivial conflicts.