Martin Pool has voted comment. Status is now: Semi-approved Comment: I'm going to merge this as-is on the basis of the previous reviews, and try to give some post review comments later. For details, see: http://bundlebuggy.aaronbentley.com/request/%3C474CBAD6.8020004%40internode.on.net%3E