Merging in latest changes from lp:quantum

author Tyler Smith <tylesmit@cisco.com>

Sat, 8 Jan 2011 00:44:09 +0000 (19:44 -0500)

committer Tyler Smith <tylesmit@cisco.com>

Sat, 8 Jan 2011 00:44:09 +0000 (19:44 -0500)
author Tyler Smith <tylesmit@cisco.com>
Sat, 8 Jan 2011 00:44:09 +0000 (19:44 -0500)
committer Tyler Smith <tylesmit@cisco.com>
Sat, 8 Jan 2011 00:44:09 +0000 (19:44 -0500)
diff --cc quantum/plugins/cisco/common/cisco_constants.py
Simple merge
diff --cc quantum/plugins/cisco/models/l2network_multi_blade.py
Simple merge
author	Tyler Smith <tylesmit@cisco.com>
	Sat, 8 Jan 2011 00:44:09 +0000 (19:44 -0500)
committer	Tyler Smith <tylesmit@cisco.com>
	Sat, 8 Jan 2011 00:44:09 +0000 (19:44 -0500)
		1	2
quantum/plugins/cisco/common/cisco_constants.py	patch \|	diff1 \|	diff2 \|	blob \| history
quantum/plugins/cisco/models/l2network_multi_blade.py	patch \|	diff1 \|	diff2 \|	blob \| history