merge cisco consolidated plugin changes

author Dan Wendlandt <dan@nicira.com>

Tue, 30 Aug 2011 16:54:49 +0000 (09:54 -0700)

committer Dan Wendlandt <dan@nicira.com>

Tue, 30 Aug 2011 16:54:49 +0000 (09:54 -0700)
author Dan Wendlandt <dan@nicira.com>
Tue, 30 Aug 2011 16:54:49 +0000 (09:54 -0700)
committer Dan Wendlandt <dan@nicira.com>
Tue, 30 Aug 2011 16:54:49 +0000 (09:54 -0700)
diff --cc quantum/plugins/cisco/tests/unit/test_cisco_extension.py
Simple merge
author	Dan Wendlandt <dan@nicira.com>
	Tue, 30 Aug 2011 16:54:49 +0000 (09:54 -0700)
committer	Dan Wendlandt <dan@nicira.com>
	Tue, 30 Aug 2011 16:54:49 +0000 (09:54 -0700)