[python-oslo-config/el6: 2/2] Merge remote-tracking branch 'origin/master' into el6

[Mark McLoughlin]

commit ec5ab5f4d9be60cc8bd69f8ca93125c49ce5777a
Merge: dc196fb 0f0d7ff
Author: Mark McLoughlin <markmc at redhat.com>
Date:   Wed Mar 6 15:39:43 2013 +0000

    Merge remote-tracking branch 'origin/master' into el6

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---