From 5424690912a6edc2a64bfbbd44120e52a85c7f48 Mon Sep 17 00:00:00 2001
From: Ken Pepple <ken.pepple@gmail.com>
Date: Sun, 9 Jan 2011 09:25:27 -0800
Subject: [PATCH] added myself to authors and fixed typo to follow standard

---
 Authors            | 2 +-
 doc/source/conf.py | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Authors b/Authors
index 8dfaf955740a..99c493b0e510 100644
--- a/Authors
+++ b/Authors
@@ -40,4 +40,4 @@ Trey Morris <trey.morris@rackspace.com>
 Vishvananda Ishaya <vishvananda@gmail.com>
 Youcef Laribi <Youcef.Laribi@eu.citrix.com>
 Zhixue Wu <Zhixue.Wu@citrix.com>
-
+Ken Pepple <ken.pepple@gmail.com>
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 34c4ec2881d4..996dfb0a7ff5 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -60,11 +60,12 @@ copyright = u'2010, United States Government as represented by the Administrator
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-import nova.version
+from nova import version as nova_version
+#import nova.version
 # The full version, including alpha/beta/rc tags.
-release = nova.version.version_string()
+release = nova_version.version_string()
 # The short X.Y version.
-version = nova.version.canonical_version_string()
+version = nova_version.canonical_version_string()
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.