Merge branch 'master' of ssh://johnwwil@.../gitroot/pulse-sequencer/sequencer-vhdl
Authored by: John W 2010-01-27
Parents: [5dcdee][dcc5de]
Child: [6ee831]
