Merge changes I1474351f,I2ddc5ffa
authorGiovanni Meo <gmeo@cisco.com>
Tue, 17 Dec 2013 13:46:06 +0000 (13:46 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 17 Dec 2013 13:46:06 +0000 (13:46 +0000)
* changes:
  FRM to properly handle timed flows in case of switch down/up
  Adding password salting


Trivial merge