Given that this was affecting others, I created a bug on sourceforge and have commited the fix. A patch has been attached to the bug report if you'd like to download and use that.
http://sourceforge.net/tracker/index.php?func=detail&aid=1791241&group_id=169098&atid=849053 Darren
