Merge branch 'dev' of ssh://engr.geek.net/forge into dev
Authored by: Mark Ramm 2010-10-07
Parent(s): [131d28][81407d]
Child(ren): [6d51e4]