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)

Trivial merge