What do you think about removing the scratchpad block from 2.1.x and have it only once in our repository - this avoids committing changes to both branches (2.1.x and trunk) and makes handling it a little bit easier. The scratchpad contains experimental code anyway, so I think it's sufficient to have this in trunk only. Of course, if something moves out of the scratchpad it still can be added to 2.1.x as well.
makes sense +1 -- Torsten
