Merge branch 'stable-0.7'
commit624572b65d942cfeda504a36f927618b264aa31a
authorShawn O. Pearce <spearce@spearce.org>
Sun, 21 Mar 2010 02:05:29 +0000 (20 19:05 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Sun, 21 Mar 2010 02:05:34 +0000 (20 19:05 -0700)
tree74500156873f91ab3a349c533c2a89e97751b375
parent0f95d2d0462f8badd3cdb1fadb6dbb3fe84074b4
parent764f1635d4fec81e178bd98a08400eee2f633de0
Merge branch 'stable-0.7'

* stable-0.7:
  tools/version.sh: Update OSGi manifest files
  Drop CQ 3448 from IP log

Change-Id: I8d78d27c48c16a70078bf76b255f8ade8e94db2a