Merge branch 'dev' of ssh://engr.geek.net/forge into dev
Authored by: Jenny Steele 2012-07-02
Parent(s): [915d1b][bca938]
Child(ren): [d9449e]