Merge commit 'chris/master' into use_interface_roles
t0m [Wed, 27 May 2009 23:14:23 +0000 (00:14 +0100)]

Trivial merge