tree e018aa7703a1bfb2a86c39b08554c98d656ede77
parent 21c75c7fc01523e5e3283444a25d8bad17cc9df4
author Dan Talayco <dtalayco@stanford.edu> 1266044454 -0800
committer Dan Talayco <dtalayco@stanford.edu> 1266044454 -0800

Added promisc stuff here; moved other stuff to controller