Merged trunk

2011-03-01 10:53:19 -06:00
parent 97566c04b3 bb7c1b8c63
commit a95402f5d6
190 changed files with 2477 additions and 1275 deletions
@@ -41,4 +41,5 @@
 <ueno.nachi@lab.ntt.co.jp> <openstack@lab.ntt.co.jp>
 <vishvananda@gmail.com> <root@mirror.nasanebula.net>
 <vishvananda@gmail.com> <root@ubuntu>
+<naveedm9@gmail.com> <naveed.massjouni@rackspace.com>
 <vishvananda@gmail.com> <vishvananda@yahoo.com>