Merge branch 'ticket-5028'
authorIan Lynagh <igloo@earth.li>
Fri, 1 Apr 2011 14:30:33 +0000 (15:30 +0100)
committerIan Lynagh <igloo@earth.li>
Fri, 1 Apr 2011 14:30:33 +0000 (15:30 +0100)

Trivial merge