About GIT and other alike tools : I just want to remind people interested about legal issues when it comes to merge with Apache trunk (yes it's not HotWax trunk, but I'm sure nobody overlooked that ;o). We had already some discussion last year. This link may help http://www.nabble.com/forum/Search.jtp?local=y&forum=2740&query=%22joint+work%22. And I can provide you some more if you want...
Maybe this discussion is not closed ? Jacques