This change has been merged. Previous status: Conditionally approved For details, see: http://bundlebuggy.aaronbentley.com/request/%3C20080721092440.4B4CD39005D%40grace.sourcefrog.net%3E