[rubygem-linode/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit bee03eb48f3064dca61b4d0f930ccc49bca99200
Merge: 6a54ea3 e3bfa90
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Mar 7 14:15:53 2012 +0100

    Merge branch 'master' into f17

 .gitignore          |    1 +
 rubygem-linode.spec |   74 ++++++++++++++++++++++++++++----------------------
 sources             |    2 +-
 3 files changed, 43 insertions(+), 34 deletions(-)
---