From: James Bowes <jbowes@redhat.com>
Date: Mon, 23 Jun 2008 18:52:39 +0000 (-0400)
Subject: Merge commit 'krh/master'
X-Git-Tag: 0.1~107
X-Git-Url: http://project.juiblex.co.uk/git/?a=commitdiff_plain;h=298fd6434e6d144147ebf738db6cb09f5ac41095;p=razor2.git%2F.git

Merge commit 'krh/master'
---

298fd6434e6d144147ebf738db6cb09f5ac41095