the obvious parts (e.g. copyright updates) would be fine to merge now.
the rest should be reviewed by Hans-Peter Nilsson.
-mike