Merge branch 'cobbler-deb'

Murge into master. Pushued to github already
Merge branch 'master' of git://github.com/cobbler/cobbler
Only cosmetic cleanup - removed commands that were commented out, added spaces for more clear code
Merge branch 'cobbler-deb'

Only cosmetic cleanup - removed commands that were commented out, added spaces for more clear code
Merge branch 'master' of git://github.com/cobbler/cobbler

merge with upstream master
Merge branch 'master' of git://github.com/cobbler/cobbler
Merge branch 'master' of git://github.com/cobbler/cobbler

pull master from github
BUGFIX - slight typo in format for  message when trying to symlink

Was resulting in a stack dump due to the formatted string missing
the correct parameter.
Added dhcp_service_name method to determine proper dhcpd service name to use in restart during sync
BUGFIX: Importing wrong arch results in silent error

Self explanatory. If you import --arch=invalid, a bug in
manage_import_redhat.py goes down a path that uses the string
module without importing it, resulting in a wierd error to
stdout/stderr which gives no clue what the problem is - and a
not super easy to track down error to the log. This trivial
patch fixes this.
Merge pull request #375 from daviesalex/BUGFIX-import-wrong-arch

BUGFIX: Importing wrong arch results in silent error
Merge branch 'master' of git://github.com/cobbler/cobbler
First implementation of CNAMEs support working!

Preliminarily tested on the test bench, haven't tested on production system.
Slight changes with field_info.py
Merge pull request #376 from bytecar/cname

FEATURE - CNAME support for Cobbler managed DNS.
Merge branch 'master' of git://github.com/cobbler/cobbler
Merge branch 'master' of git://github.com/cobbler/cobbler

Pull from upstream master
Added ubuntu to kickstart_start snippet and one more instance in kickstart_done
Merge pull request #377 from lflaks/cobbler-deb

Cobbler deb snippet cleanups
Merge pull request #374 from dgivens/dhcp_service_name

Used dhcp_service_name() from utils to get service name in cobbler sync