From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 9 Aug 2011 08:02:44 +0000 (+0200)
Subject: Merge remote branch 'pkern/master'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=063366f2e024d0f0a0731744e5a0d76adf6cfed8;p=dsa-metapackages.git

Merge remote branch 'pkern/master'

* pkern/master:
  release.debian.org: drop clasp, add openjdk-6-jre-headless
---

063366f2e024d0f0a0731744e5a0d76adf6cfed8