Merge branch 'xrg' into optimize
Conflicts: bin/netsvc.py debian/changelog bzr revid: p_christ@hol.gr-20090925205132-xe2jtkenhv8n320d
This commit is contained in:
Conflicts: bin/netsvc.py debian/changelog bzr revid: p_christ@hol.gr-20090925205132-xe2jtkenhv8n320d