merge from trunk

2 files changed, 2 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e547426e..63d1d62e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@
  - configdrive: consider partitions as possible datasources if they have
    theh correct filesystem label. [Paul Querna]
  - initial freebsd support [Harm Weites]
+ - fix in is_ipv4 to accept IP addresses with a '0' in them.
 0.7.4:
  - fix issue mounting 'ephemeral0' if ephemeral0 was an alias for a
    partitioned block device with target filesystem on ephemeral0.1.
diff --git a/cloudinit/util.py b/cloudinit/util.py
index c0121848..08cdd8c8 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -369,7 +369,7 @@ def is_ipv4(instr):
         return False
 
     try:
-        toks = [x for x in toks if int(x) < 256 and int(x) > 0]
+        toks = [x for x in toks if int(x) < 256 and int(x) >= 0]
     except:
         return False