Merge commit 'origin/bug_178_update_meta_files' into experimental
authoracid-burn <acidburn@opendreambox.org>
Wed, 25 Nov 2009 19:59:35 +0000 (20:59 +0100)
committeracid-burn <acidburn@opendreambox.org>
Wed, 25 Nov 2009 19:59:35 +0000 (20:59 +0100)

Trivial merge