=== modified file 'ChangeLog'
--- ChangeLog	2008-08-05 13:06:58 +0000
+++ ChangeLog	2008-08-10 05:27:19 +0000
@@ -1,3 +1,8 @@
+2008-08-10  John Stowers  <john.stowers@gmail.com>
+
+	* conduit/conduit: also look in lib/mozilla-firefox for
+	run-mozilla.sh. Fixes #546478 (Christian Schlotter)
+
 2008-08-06  John Stowers  <john.stowers@gmail.com>
 
 	* scripts/release.sh:

=== modified file 'conduit/conduit'
--- conduit/conduit	2008-06-07 06:36:33 +0000
+++ conduit/conduit	2008-08-10 05:31:45 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Start Conduit
 
 # Work around https://bugs.launchpad.net/ubuntu/+source/firefox/+bug/26436
@@ -8,7 +8,7 @@
 # Run mozilla takes care of settin up the appropriate environment variables
 # to run a program using mozilla libs
 
-for d in `ls -d /usr/lib*/firefox* | sort -r`
+for d in `ls -d /usr/lib*/{mozilla-,}firefox* 2> /dev/null | sort -r`
 do
     if [ -x $d/run-mozilla.sh ]; then
         echo INFO: FOUND FIREFOX LIBS AT $d

