Merge branch 'stable-0.7'
commit322f723e997dcb45f184d9431e53d18195ccbe42
authorShawn O. Pearce <spearce@spearce.org>
Mon, 22 Mar 2010 15:48:30 +0000 (22 08:48 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 22 Mar 2010 15:48:30 +0000 (22 08:48 -0700)
treec80f4ec76aee8ded52c7f016ea51dc7b160854c4
parentee944e60a9994cd6f6eb58c0f4be07480a306261
parent596961c91c5f782d48ae7f3857bd231033aec73c
Merge branch 'stable-0.7'

* stable-0.7:
  tools/version.sh: Update OSGi manifest files