yamcs/yamcs — pull request #22 by fqqb (2013-10-09 15:02:00+00:00)
Title: Mixed commits

lmk if you want me to split them up in different pull requests