Merge branch 'gsoc_breadboard' of git.shadowcat.co.uk:Catalyst-Runtime into gsoc_brea...
André Walker [Thu, 4 Aug 2011 23:43:05 +0000 (20:43 -0300)]

Trivial merge