Merge branch 'upstream'
authorSebastian Goth <seezer@roath.org>
Thu, 26 Jun 2008 21:00:37 +0000 (23:00 +0200)
committerSebastian Goth <seezer@roath.org>
Thu, 26 Jun 2008 21:00:37 +0000 (23:00 +0200)
commitc6db8944e7792fe44a15c23aed10131b62115851
tree6813a65f73fc07e22ef5b57b822a2a324bf17550
parentfd6cc80e80d2578432a7d18d59dc9f79ac9bfaec
parenta302cdbd9d418a8ca088ddae98c5ea178e8eb9f3
Merge branch 'upstream'