Merge branch 'andrewwatts/master'

contrib/debian/init.d/celerybeat

@@ -88,7 +88,9 @@ check_dev_null() {
 export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 if [ ! -z "$VIRTUALENV" ]; then
     export PATH="$VIRTUALENV/bin:$PATH"
-    CELERYBEAT="$VIRTUALENV/bin/$CELERYBEAT"
+    if [ -z "$DJANGO_PROJECT_DIR" ]; then
+        CELERYBEAT="$VIRTUALENV/bin/$CELERYBEAT"
+    fi
 fi
 
 if [ -f "$CELERYBEAT" && ! -x "$CELERYBEAT" ]; then

contrib/debian/init.d/celeryd

@@ -83,7 +83,9 @@ check_dev_null() {
 export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 if [ ! -z "$VIRTUALENV" ]; then
     export PATH="$VIRTUALENV/bin:$PATH"
-    CELERYD="$VIRTUALENV/bin/$CELERYD"
+    if [ -z "$DJANGO_PROJECT_DIR" ]; then
+    	CELERYD="$VIRTUALENV/bin/$CELERYD"
+    fi
 fi