Merge branch 'master' into nine

Conflicts:
	master/buildbot/status/web/pngstatus.py
	master/buildbot/test/unit/test_status_web_statuspng.py
	master/docs/manual/cfg-statustargets.rst

master/buildbot/status/builder.py

@@ -328,7 +328,21 @@ def setCategory(self, category):
     def getCategory(self):
         return self.category
 
-    def getBuild(self, number):
+    def getBuildByRevision(self, rev):
+        number = self.nextBuildNumber - 1
+        while number > 0:
+            build = self.getBuildByNumber(number)
+            got_revision = build.getAllGotRevisions().get("")
+
+            if rev == got_revision:
+                return build
+            number -= 1
+        return None
+
+    def getBuild(self, number, revision=None):
+        if revision is not None:
+            return self.getBuildByRevision(revision)
+
         if number < 0:
             number = self.nextBuildNumber + number
         if number < 0 or number >= self.nextBuildNumber:

master/docs/conf.py

@@ -132,7 +132,7 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-html_logo = 'header-text-transparent.png'
+html_logo = os.path.join('_images', 'header-text-transparent.png')
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
@@ -206,7 +206,7 @@
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-latex_logo = 'header-text-transparent.png'
+latex_logo = os.path.join('_images', 'header-text-transparent.png')
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.