[euca2ools/el5/master] (15 commits) ...Merge branch 'master' into el5

[gholms]

Summary of changes:

  1167e71... Stop stripping leading '0's from user IDs [LP:479823] (*)
  3590d8b... Fix bad behavior with user IDs that contain '-' (*)
  dce4290... Preserve filesystem labels and UUIDs when bundling [LP:6677 (*)
  aa2a69b... Merge branch 'master' into f14 (*)
  1e1b9de... Fix Boto 2.0 compatibility (*)
  f1feb83... Clean up spec file (*)
  83d3779... Merge branch 'master' into f14 (*)
  2a0c1e7... Merge branch 'f14' (*)
  d8b998f... Work around Boto 2.0 + Eucalyptus 2.0 incompatibility [RH:6 (*)
  6ec3a41... Add unlisted dependencies for euca-bundle-vol (*)
  71bdb39... Fix typos introduced by the FSID patch (*)
  d5300c5... Fix bundling failure on small images [LP:760157] (*)
  82c4877... Minor spec file cleanup
  5b4aab0... Fix use of bad mkfs options on older systems [LP:771498] (*)
  2a90edc... Merge branch 'master' into el5

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