Merge branch 'rc' into testing
commit2a55321d4ce33c6d7249685d356ea47d78274694
authorOliver Pinter <oliver.pntr@gmail.com>
Thu, 1 May 2008 16:29:04 +0000 (1 18:29 +0200)
committerOliver Pinter <oliver.pntr@gmail.com>
Thu, 1 May 2008 16:29:04 +0000 (1 18:29 +0200)
tree0c2ac0be52d661c48928129b79b4c106c6f0bd17
parent47a1b6c7cb8b25471b52f5946025b427f277ee75
parent6f1b60cbc02c8aa55fc7acc3848815cc281aed41
Merge branch 'rc' into testing

Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>