Merge branches 'upstream' and 'bug/22622'
commit2f0498b1f9900d507f552e2ecd049ef3b3cadb82
authorygrek <ygrek@autistici.org>
Mon, 24 May 2010 07:40:17 +0000 (24 10:40 +0300)
committerygrek <ygrek@autistici.org>
Mon, 24 May 2010 07:40:17 +0000 (24 10:40 +0300)
tree161eee8b7b363cefb33c7b5fa61f7a2eedc3b74e
parentc3490f7596a488891cb8348b117e256be4bc876b
parentb3d002c4e01da83f183a193a4409cfe9f62cfd37
Merge branches 'upstream' and 'bug/22622'