K 10
svn:author
V 2
ed
K 8
svn:date
V 27
2011-03-22T21:15:50.470271Z
K 7
svn:log
V 216
Remove this branch, so I can revive it within a minute.

I'm having some really tough problems with merging; I get conflicts for
every single file. Also, it seems some patches ended up here which
shouldn't be there.

END