[kupfer: 5/7] Merge remote-tracking branch 'karol/bugs/lp1000980_desktop'

[Ulrik Sverdrup <usverdrup src gnome org>]

commit a2e9049731b20a11c31e97bf87752edef3a79cca
Merge: 3f33f1e 450e116
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Tue May 22 17:18:54 2012 +0200

    Merge remote-tracking branch 'karol/bugs/lp1000980_desktop'
    
    * karol/bugs/lp1000980_desktop:
      core: don't load no existing directories into catalog

 kupfer/core/data.py   |    2 ++
 kupfer/obj/sources.py |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)
---