Result of svn merge -r65354:66054 svn+ssh://svn/svn/linden/branches/ezrpc into release

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