Merge branch 'gsoc_breadboard' into gsoc_breadboard_splittests gsoc_breadboard_splittests
André Walker [Sat, 10 Mar 2012 17:49:15 +0000 (14:49 -0300)]

Trivial merge