merge of '5347007e975b912492b32fee6d4299c689309996'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 18 Sep 2008 18:13:27 +0000 (18:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 18 Sep 2008 18:13:27 +0000 (18:13 +0000)
commit661677d5a9744dbe2146bb5cc8fdcd3e64e1c378
treefd117bf7e51305c79a1a4f529347a554e28baa58
parent495f4bae01c0a9633dff08935b69113dfeff55d5
parentf2cb224e46e8b1b40117b4629194ed2b9d7cf923
Merge ... '5347007e975b912492b32fee6d4299c689309996'
     and '5430f9356289c9c7b4cc647832f9e792c388096c'