Merge git://gitorious.org/~luki/simavr/lukis-simavr into dev-home