Merging in Shweta's fixes from the review by Sumit

author Tyler Smith <tylesmit@cisco.com>

Sat, 8 Jan 2011 06:46:11 +0000 (01:46 -0500)

committer Tyler Smith <tylesmit@cisco.com>

Sat, 8 Jan 2011 06:46:11 +0000 (01:46 -0500)
author Tyler Smith <tylesmit@cisco.com>
Sat, 8 Jan 2011 06:46:11 +0000 (01:46 -0500)
committer Tyler Smith <tylesmit@cisco.com>
Sat, 8 Jan 2011 06:46:11 +0000 (01:46 -0500)
diff --cc quantum/plugins/cisco/tests/unit/test_ucs_inventory.py
Simple merge
author	Tyler Smith <tylesmit@cisco.com>
	Sat, 8 Jan 2011 06:46:11 +0000 (01:46 -0500)
committer	Tyler Smith <tylesmit@cisco.com>
	Sat, 8 Jan 2011 06:46:11 +0000 (01:46 -0500)