From b9e70edb7a1ca6bb4630fbb311e5a3d04829043c Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 11 Nov 2008 18:14:11 +0000
Subject: Merge commit 'v0.82.1'

---
diff --git a/bin/copy-from-journal b/bin/copy-from-journal
index 61b91c9..9be49d4 100755
--- a/bin/copy-from-journal
+++ b/bin/copy-from-journal
@@ -9,6 +9,9 @@ import os
 import shutil
 import optparse
 
+if os.path.exists("/tmp/olpc-session-bus"):
+    os.environ["DBUS_SESSION_BUS_ADDRESS"] = "unix:path=/tmp/olpc-session-bus"
+
 from sugar.datastore import datastore
 import sugar.mime
 
diff --git a/bin/copy-to-journal b/bin/copy-to-journal
index b45677a..ce72f2b 100755
--- a/bin/copy-to-journal
+++ b/bin/copy-to-journal
@@ -11,6 +11,9 @@ import sys
 import os
 import optparse
 
+if os.path.exists("/tmp/olpc-session-bus"):
+    os.environ["DBUS_SESSION_BUS_ADDRESS"] = "unix:path=/tmp/olpc-session-bus"
+
 from sugar.datastore import datastore
 
 def build_option_parser():
diff --git a/configure.ac b/configure.ac
index dbcc25d..9b0eabf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sugar-datastore],[0.82.0],[],[sugar-datastore])
+AC_INIT([sugar-datastore],[0.82.1],[],[sugar-datastore])
 
 AC_PREREQ([2.59])
 
--
cgit v0.9.1