Merge branch 'upstream'
commit197c41c986564e644e2d2ff3506d6c85dba7aa44
authorRichard Hartmann <richih.mailinglist@gmail.com>
Fri, 27 Nov 2009 21:46:00 +0000 (27 22:46 +0100)
committerRichard Hartmann <richih.mailinglist@gmail.com>
Fri, 27 Nov 2009 21:46:00 +0000 (27 22:46 +0100)
tree5aaa444d25ecb4cce0de65af7e4526210f366181
parentb4c84c18982654959de2f72b2a609874518584ac
parentd480f986f935be2a3aea8857bb4e34fce16c6f70
Merge branch 'upstream'