Merge "removed dead code that was causing a warning"
authorGiovanni Meo <gmeo@cisco.com>
Sat, 23 Mar 2013 19:56:15 +0000 (19:56 +0000)
committerGerrit Code Review <gerrit@daylight1.linux-foundation.org>
Sat, 23 Mar 2013 19:56:15 +0000 (19:56 +0000)

Trivial merge