Merge commit 'origin/bug_494_disable_automatic_ipkgupdate'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 31 Mar 2010 08:41:40 +0000 (10:41 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 31 Mar 2010 08:41:40 +0000 (10:41 +0200)

Trivial merge