merged with trunk
authordanigm <dani@danigm.net>
Sun, 12 Jul 2009 17:02:15 +0000 (19:02 +0200)
committerdanigm <dani@danigm.net>
Sun, 12 Jul 2009 17:02:15 +0000 (19:02 +0200)
commit2d222ce46b341b8363e35d8f9aaf1bbe987914dc
treebe1a2d8c25f102401d935c49aa941eceff4b1f45
parent820d5149cd0370be40f87e10bdd3e33bd7c01b68
parent4ad43b322c0e222bf5c787e8fbada76818927b6b
merged with trunk