From 39e4c60f3aaf751676b7e8dbbddabf011d7233a8 Mon Sep 17 00:00:00 2001
From: Chip Childers <chip.childers@gmail.com>
Date: Mon, 1 Oct 2012 12:34:46 -0400
Subject: [PATCH] CLOUDSTACK-147 - Adding rsyslog.conf to the public domain in
 our legal docs

---
 LICENSE                      | 2 ++
 tools/whisker/descriptor.xml | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/LICENSE b/LICENSE
index 96952ecc65b..d43769fbf4b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2350,6 +2350,8 @@ Within the deps/awsapi-lib directory
 
 Within the patches/systemvm/debian/config/etc directory
     placed in the public domain
+        by Adiscon GmbH  http://www.adiscon.com/ 
+            rsyslog.conf
         by Simon Kelley   
             dnsmasq.conf
             vpcdnsmasq.conf
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
index 0564d302fd1..007535def5c 100644
--- a/tools/whisker/descriptor.xml
+++ b/tools/whisker/descriptor.xml
@@ -2409,6 +2409,10 @@ this distribution.
             id='libvirt.org'
             name='The libvirt project'
             url='http://libvirt.org/' />
+        <organisation
+            id='adiscon.com'
+            name='Adiscon GmbH'
+            url='http://www.adiscon.com/' />
     </organisations>
     <primary-license id='ApacheLicenseVersion2'>
         <copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice>
@@ -2444,6 +2448,9 @@ Copyright (c) 2012 The Apache Software Foundation
     </within>
     <within dir='patches/systemvm/debian/config/etc'>
         <public-domain>
+            <by-organisation id='adiscon.com'>
+                <resource name='rsyslog.conf' />
+            </by-organisation>
             <by-organisation id='person:simon.kelley'>
                 <resource name='vpcdnsmasq.conf' />
                 <resource name='dnsmasq.conf' />