Get merged tree into an installalble state.

I have only tested the all, rpms and *clean targets directly.
install may work but the rpm moves a lot of things around for us.

The Apache configuration file isn't in its final state but it works
with the new mod_python configuration.

ipaserver/mod_python_xmlrpc.py

@@ -46,7 +46,6 @@ try:
 except ImportError:
     pass
 
-
 # Global list of available functions
 gfunctions = {}