Merge branch 'master' of github.com:jclouds/jclouds into 1.5.x

* 'master' of github.com:jclouds/jclouds:
  added min-disk to compute2.clj
diff --git a/compute/src/main/clojure/org/jclouds/compute2.clj b/compute/src/main/clojure/org/jclouds/compute2.clj
index 8d9147e..fc75cd7 100644
--- a/compute/src/main/clojure/org/jclouds/compute2.clj
+++ b/compute/src/main/clojure/org/jclouds/compute2.clj
@@ -332,7 +332,7 @@
        :os-name-matches :os-description-matches :os-version-matches
        :os-arch-matches :os-64-bit :image-name-matches
        :image-version-matches :image-description-matches :image-matches
-       :min-cores :min-ram])))
+       :min-cores :min-ram :min-disk])))
 
 (def
   ^{:doc "TemplateOptions functions" :private true}
@@ -425,7 +425,7 @@
        os-name-matches os-description-matches os-version-matches
        os-arch-matches os-64-bit mage-name-matches
        image-version-matches image-description-matches image-matches
-       min-cores min-ram smallest fastest biggest any]
+       min-cores min-ram min-disk smallest fastest biggest any]
     :as options}]
   (let [builder (.. compute (templateBuilder))]
     (doseq [[option value] options]