commit 16c2b5aa67c8a426498ca11e8d45ac8c71a7f09a Merge: 5484887... 0fa5efb... Author: Douglas Silas <dhensley at redhat.com> Date: Mon Jun 28 20:52:56 2010 +0200 Merge branch 'martin' en-US/Dynamic_Host_Configuration_Protocol_DHCP.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---