Bundle Buggy has detected this merge request. For details, see: http://bundlebuggy.aaronbentley.com/request/%3C20070414025853.GP3524%40jameswestby.net%3E