Merge branch '1.4.x'

Conflicts:
	debian/bcfg2-server.install
	doc/server/plugins/grouping/metadata.txt
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/Portage.py
	src/lib/Bcfg2/Client/Tools/RcUpdate.py
	src/lib/Bcfg2/Client/Tools/YUM24.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Client/Tools/launchd.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	src/lib/Bcfg2/Utils.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 0 insertions, 179 deletions

diff --git a/src/lib/Bcfg2/Server/Hostbase/media/boxypastel.css b/src/lib/Bcfg2/Server/Hostbase/media/boxypastel.css
deleted file mode 100644
index 7ae0684ef..000000000
--- a/src/lib/Bcfg2/Server/Hostbase/media/boxypastel.css
+++ /dev/null
@@ -1,179 +0,0 @@
-body {
-    background-color: #fff;
-    color: #000;
-    font: 12px 'Lucida Grande', Arial, Helvetica, sans-serif;
-    margin-left:0px;
-    margin-right:100px;
-}
-/* links */
-a:link {
-    color: #00f;
-    text-decoration: none;
-}
-a:visited {
-    color: #00a;
-    text-decoration: none;
-}
-a:hover {
-    color: #00a;
-    text-decoration: underline;
-}
-a:active {
-    color: #00a;
-    text-decoration: underline;
-}
-/* divs*/
-div.bad {
-    border: 1px solid #660000;
-    background: #FF6A6A;
-    margin: 10px 0;
-    padding: 8px;
-    text-align: left;
-    margin-left:50px;
-    margin-right:50px;
-}
-div.modified {
-    border: 1px solid #CC9900;
-    background: #FFEC8B;
-    margin: 10px 0;
-    padding: 8px;
-    text-align: left;
-    margin-left:50px;
-    margin-right:50px;
-}
-div.clean {
-    border: 1px solid #006600;
-    background: #9AFF9A;
-    margin: 10px 0;
-    padding: 8px;
-    text-align: left;
-    margin-left:50px;
-    margin-right:50px;
-}
-div.extra {
-    border: 1px solid #006600;
-    background: #6699CC;
-    margin: 10px 0;
-    padding: 8px;
-    text-align: left;
-    margin-left:50px;
-    margin-right:50px;
-}
-div.warning {
-    border: 1px
-    solid #CC3300;
-    background: #FF9933;
-    margin: 10px 0;
-    padding: 8px;
-    text-align: left;
-    margin-left:50px;
-    margin-right:50px;
-}
-div.all-warning {
-    border: 1px solid #DD5544;
-    background: #FFD9A2;
-    margin: 10px 0;
-    padding: 8px;
-    text-align: left;
-    margin-left:50px;
-    margin-right:50px;
-}
-div.down {
-    border: 1px
-    solid #999;
-    background-color: #DDD;
-    margin: 10px 0;
-    padding: 8px;
-    text-align: left;
-    margin-left:50px;
-    margin-right:50px;
-}
-div.items{
-    display: none;
-}
-div.nodebox {
-    border: 1px solid #c7cfd5;
-    background: #f1f5f9;
-    margin: 20px 0;
-    padding: 8px 8px 16px 8px;
-    text-align: left;
-    position:relative;
-}
-div.header {
-    background-color: #DDD;
-    padding: 8px;
-    text-indent:50px;
-    position:relative;
-}
-
-/*Spans*/
-.nodename {
-    font-style: italic;
-}
-.nodelisttitle {
-    font-size: 14px;
-}
-
-h2{
-    font-size: 16px;
-    color: #000;
-}
-
-ul.plain {
-    list-style-type:none;
-    text-align: left;
-}
-
-.notebox {
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    padding: 1px;
-    text-indent:0px;
-    border: 1px solid #FFF;
-    background: #999;
-    color: #FFF;
-}
-
-.configbox {
-    position: absolute;
-    bottom: 0px;
-    right: 0px;
-    padding: 1px;
-    text-indent:0px;
-    border: 1px solid #999;
-    background: #FFF;
-    color: #999;
-}
-
-p.indented{
-    text-indent: 50px
-}
-
-/*
-   Sortable tables */
-table.sortable a.sortheader {
-    background-color:#dfd;
-    font-weight: bold;
-    text-decoration: none;
-    display: block;
-}
-table.sortable {
-    padding: 2px 4px 2px 4px;
-    border: 1px solid #000000;
-    border-spacing: 0px
-}
-td.sortable{
-    padding: 2px 8px 2px 8px;
-}
-
-th.sortable{
-    background-color:#F3DD91;
-    border: 1px solid #FFFFFF;
-}
-tr.tablelist {
-    background-color:#EDF3FE;
-}
-tr.tablelist-alt{
-    background-color:#FFFFFF;
-}