[kupfer: 3/3] Merge remote branch 'karol/master'

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 754a693e62a073986682229e02895ea4cd29fed6
Merge: e7aef39 8c61034
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Mon Mar 1 18:45:32 2010 +0100

    Merge remote branch 'karol/master'
    
    * karol/master:
      pl: update translation
      plugin.truecrypt: fix problem with imports

 kupfer/plugin/truecrypt.py |    5 +-
 po/pl.po                   |  918 +++++++++++++++++++++++++++++---------------
 2 files changed, 602 insertions(+), 321 deletions(-)
---