From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 20 Jun 2015 02:02:45 +0000 (+1000)
Subject: Merge commit '87f7336193d1'
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=92627a4a3489079993c43ebf70caad7914b5d5ec;p=next-scripts

Merge commit '87f7336193d1'

Conflicts:
	common.sh

Use sfr's version of common.sh
---

92627a4a3489079993c43ebf70caad7914b5d5ec