commit 06b142f8230b660748f9fa4797b911381882881d Merge: faa7c18 a6d07c0 Author: Geoff Simmons <geoff at uplex.de> Date: Tue Jun 7 14:03:02 2011 +0200 Merge branch 'HEAD', remote branch 'origin' into experimental-ims