From 88d7d45316186af931285b7f03d2a78cd04f888f Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Mon, 16 Jul 2007 20:16:05 +0000
Subject: Result of svn merge -r65183:65337
 svn+ssh://svn/svn/linden/branches/python-shuffle into release.

---
 indra/test/test_llmanifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/test')

diff --git a/indra/test/test_llmanifest.py b/indra/test/test_llmanifest.py
index f4fc2820eb..2c4662a83d 100644
--- a/indra/test/test_llmanifest.py
+++ b/indra/test/test_llmanifest.py
@@ -6,7 +6,7 @@
 # Copyright (c) 2006-$CurrentYear$, Linden Research, Inc.
 # $License$
 
-from indra import llmanifest
+from indra.util import llmanifest
 import os.path
 import os
 import unittest
-- 
cgit v1.2.3