Merge branch 'dhcpcd-update'
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Tue, 26 Jan 2010 10:37:28 +0000 (11:37 +0100)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Tue, 26 Jan 2010 10:37:28 +0000 (11:37 +0100)

Trivial merge