From 715e5f75c56820e8282376e5b5d1ea4c95b81e62 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 14:06:38 -0600
Subject: [PATCH] Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob,
 KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4

---
 main/libraries/python-trinity | 2 +-
 main/tdebindings              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/libraries/python-trinity b/main/libraries/python-trinity
index 62e707662..c88a2a8ce 160000
--- a/main/libraries/python-trinity
+++ b/main/libraries/python-trinity
@@ -1 +1 @@
-Subproject commit 62e707662a0943c63abdd7df358e323c95a97eda
+Subproject commit c88a2a8ce633d128b10ea405311524b907174580
diff --git a/main/tdebindings b/main/tdebindings
index a23f1fc1a..960d2aa44 160000
--- a/main/tdebindings
+++ b/main/tdebindings
@@ -1 +1 @@
-Subproject commit a23f1fc1a162ecb85ed44484372faa26141af33a
+Subproject commit 960d2aa44cd64729292ebc48b7cb6eaf18534de5