upstream merge
authorJoakim Verona <joakim@verona.se>
Thu, 19 Aug 2010 07:34:21 +0000 (09:34 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 19 Aug 2010 07:34:21 +0000 (09:34 +0200)
commit96fa1768839e3a9aa5ab5f2b782cea376460df9d
treef4c2fc0e8bb15dd084aa10bb8b2fb7ab43630cdf
parent549a73b97bce9fe51547332424e0a6cb7070df1a
parent2c0ac86767b5b7f362a287b5282d8397777b98a2
upstream merge