[euca2ools/f18] (4 commits) ...Upstream update (2.1.1)

[gholms]

Summary of changes:

  f028fc5... Upstream update (1.3.2) (*)
  e6735d2... Merge branch 'master' into el6 (*)
  e0a67f8... Clean up .gitignore (*)
  309bbd6... Upstream update (2.1.1) (*)

(*) This commit already existed in another branch; no separate mail sent