commit dedb411d8c41c4adaa2ea5e34ebf94e2ce4a913a Merge: 06b142f 7b1006d Author: Geoff Simmons <geoff at uplex.de> Date: Wed Jun 8 13:55:24 2011 +0200 Merge branch 'HEAD', remote branch 'origin' into experimental-ims