osmocom-bb.git
13 years agoMerge commit '7459d6cfd1765f8431b3d9a262eff332f9af807c' into sylvain/pending
Sylvain Munaut [Tue, 27 Jul 2010 18:50:57 +0000 (20:50 +0200)]
Merge commit '7459d6cfd1765f8431b3d9a262eff332f9af807c' into sylvain/pending

13 years agolayer23: Split [2/2] -> The header files
Sylvain Munaut [Tue, 27 Jul 2010 18:44:46 +0000 (20:44 +0200)]
layer23: Split [2/2] -> The header files

This split the headers and adapt the source.

We use osmocom/bb as a prefix because libosomore also
uses osmocom and generic names such as misc & common could
conflict in the future.

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
13 years agolayer23: Split [1/2] -> The source code
Sylvain Munaut [Sat, 24 Jul 2010 22:25:50 +0000 (00:25 +0200)]
layer23: Split [1/2] -> The source code

We split into :
 - common: Everything that can be shared
 - mobile: The real spec compliant mobile phones
 - misc:   Different test stuff

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
13 years agocore/msgb: Use the new osmo_panic call to handle errors
Sylvain Munaut [Sun, 25 Jul 2010 16:09:28 +0000 (18:09 +0200)]
core/msgb: Use the new osmo_panic call to handle errors

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
13 years agocore: Add some generic panic handling
Sylvain Munaut [Sun, 25 Jul 2010 16:08:54 +0000 (18:08 +0200)]
core: Add some generic panic handling

This also includes an option for a minimal 'infinite loop' type
panic that could be required for embedded target that don't have
abort() or fprintf()

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
13 years agobuild: Use AS_HELP_STRING macro to format the ./configure --help better
Sylvain Munaut [Sun, 25 Jul 2010 14:16:42 +0000 (16:16 +0200)]
build: Use AS_HELP_STRING macro to format the ./configure --help better

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
13 years agoosmocore: Add utility function rsl_chan_nr_str to RSL
Sylvain Munaut [Sun, 25 Jul 2010 10:25:17 +0000 (12:25 +0200)]
osmocore: Add utility function rsl_chan_nr_str to RSL

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
13 years agolayer23: Pre-rework of the Makefile.am
Sylvain Munaut [Sat, 24 Jul 2010 20:27:40 +0000 (22:27 +0200)]
layer23: Pre-rework of the Makefile.am

liblayer23 contained a bunch of stuff that are not shared at all ...

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
13 years agolayer23/include: Remove eXecutable permission bit from gsm322.h
Sylvain Munaut [Sat, 24 Jul 2010 20:01:09 +0000 (22:01 +0200)]
layer23/include: Remove eXecutable permission bit from gsm322.h

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
13 years agolayer23: Switch to using gsmtap_util from libosmocom
Sylvain Munaut [Sat, 24 Jul 2010 19:25:38 +0000 (21:25 +0200)]
layer23: Switch to using gsmtap_util from libosmocom

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
13 years agolayer23: Remove useless file telnet_interface.c
Sylvain Munaut [Sat, 24 Jul 2010 19:11:08 +0000 (21:11 +0200)]
layer23: Remove useless file telnet_interface.c

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
13 years agolayer23: Alloc some headroom in incoming l1ctl packets
Sylvain Munaut [Sun, 25 Jul 2010 08:16:46 +0000 (10:16 +0200)]
layer23: Alloc some headroom in incoming l1ctl packets

The upper layer will modify the headers and add somestuff in front,
so it's needed to avoid corrupting memory.

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
13 years agofw/rf: Use printd for the trf6151_set_gain debug message
Sylvain Munaut [Sat, 24 Jul 2010 22:26:22 +0000 (00:26 +0200)]
fw/rf: Use printd for the trf6151_set_gain debug message

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
13 years agomsgb: Avoid warnings that the string might contain %s or such..
Holger Hans Peter Freyther [Fri, 23 Jul 2010 11:22:23 +0000 (19:22 +0800)]
msgb: Avoid warnings that the string might contain %s or such..

13 years agogsm0808: Why should there be a lchan in the parameter...
Holger Hans Peter Freyther [Fri, 23 Jul 2010 10:35:59 +0000 (18:35 +0800)]
gsm0808: Why should there be a lchan in the parameter...

13 years agogsm0808: Import unaligned mem access fix from on-waves/bsc-master
Holger Hans Peter Freyther [Fri, 23 Jul 2010 10:20:02 +0000 (18:20 +0800)]
gsm0808: Import unaligned mem access fix from on-waves/bsc-master

13 years agogsm_utils: Move the gsm_7bit_alphabet into the impl and make it static
Holger Hans Peter Freyther [Fri, 23 Jul 2010 08:35:00 +0000 (16:35 +0800)]
gsm_utils: Move the gsm_7bit_alphabet into the impl and make it static

13 years agomsgb: Check for available headroom/tailroom and abort() if we violate it
Harald Welte [Thu, 22 Jul 2010 19:55:24 +0000 (21:55 +0200)]
msgb: Check for available headroom/tailroom and abort() if we violate it

13 years ago[layer23] Fixed interpretation of the power measurement result.
Andreas.Eversberg [Thu, 22 Jul 2010 16:14:40 +0000 (16:14 +0000)]
[layer23] Fixed interpretation of the power measurement result.

13 years ago[layer23] Re-structured the VTY commands for SIM insert/remove
Andreas.Eversberg [Thu, 22 Jul 2010 16:11:28 +0000 (16:11 +0000)]
[layer23] Re-structured the VTY commands for SIM insert/remove

Now the commands are "sim testcard <ms> [<mcc> <mnc>] " or "sim remove <ms>"

13 years agoflash: corrected coding style
Ingo Albrecht [Thu, 22 Jul 2010 02:42:47 +0000 (04:42 +0200)]
flash: corrected coding style

13 years agogsm_04_12.h: Add beginning of structs for SMS CB
Holger Hans Peter Freyther [Tue, 20 Jul 2010 21:02:33 +0000 (05:02 +0800)]
gsm_04_12.h: Add beginning of structs for SMS CB

I am trying to understand the RSL and GSM 04.12
spec to implement CBS for OpenBSC...

13 years agogsm_7bit_decode: rtext does not hold a null byte, reduce the size
Holger Hans Peter Freyther [Tue, 20 Jul 2010 19:14:01 +0000 (03:14 +0800)]
gsm_7bit_decode: rtext does not hold a null byte, reduce the size

I have added the + 1 as I thought rtext will hold a terminating
null byte but it will not.

13 years agotests: don't hardcode length values of expected encoding gsm_7bit_encode:
Nico Golde [Tue, 20 Jul 2010 13:43:58 +0000 (15:43 +0200)]
tests: don't hardcode length values of expected encoding gsm_7bit_encode:

make sure to return the number of actually written bytes gsm_7bit_decode:
calculate length of resulting septets from input length before decoding

The input length to gsm_7bit_decode reflects the number of encoded bytes
to be decoded. As the decoding is done on the input in septetes we need
to take this into account and recalculate the length.

13 years ago[display] add driver for the Toppoly TD014, as used in the C139/C140
Steve Markgraf [Mon, 19 Jul 2010 21:44:55 +0000 (23:44 +0200)]
[display] add driver for the Toppoly TD014, as used in the C139/C140

Signed-off-by: Steve Markgraf <steve@steve-m.de>
13 years ago[apps] add chainloading application
Steve Markgraf [Mon, 19 Jul 2010 21:28:57 +0000 (23:28 +0200)]
[apps] add chainloading application

It does nothing more than jumping to the Calypso romloader.

Signed-off-by: Steve Markgraf <steve@steve-m.de>
13 years ago[osmocon] add a chainloading mode for the compal ramloader
Steve Markgraf [Mon, 19 Jul 2010 21:16:58 +0000 (23:16 +0200)]
[osmocon] add a chainloading mode for the compal ramloader

The idea is to load a small application to the phone, which
activates and executes the Calypso romloader. The payload
itself then is loaded with the romloader, bypassing the magic
and the resulting size limit on the C139/C140 and J100i.

Signed-off-by: Steve Markgraf <steve@steve-m.de>
13 years agofirmware: moved cfi_flash header to flash subdirectory
Ingo Albrecht [Mon, 19 Jul 2010 10:00:58 +0000 (12:00 +0200)]
firmware: moved cfi_flash header to flash subdirectory

13 years agofirmware: small makefile reorg
Ingo Albrecht [Mon, 19 Jul 2010 08:02:43 +0000 (10:02 +0200)]
firmware: small makefile reorg

13 years agofirmware: fixed irq-less keypad support
Ingo Albrecht [Mon, 19 Jul 2010 08:01:57 +0000 (10:01 +0200)]
firmware: fixed irq-less keypad support

13 years agofirmware: moved dead-brain-flags to primary makefile
Ingo Albrecht [Mon, 19 Jul 2010 07:09:24 +0000 (09:09 +0200)]
firmware: moved dead-brain-flags to primary makefile

13 years agoloader: meaner. now supports address ranges for all relevant flash operations. report...
Ingo Albrecht [Mon, 19 Jul 2010 06:57:54 +0000 (08:57 +0200)]
loader: meaner. now supports address ranges for all relevant flash operations. reports better.

13 years agofirmware: e88 flash linkage
Ingo Albrecht [Mon, 19 Jul 2010 06:57:04 +0000 (08:57 +0200)]
firmware: e88 flash linkage

13 years agofirmware: better flash protection
Ingo Albrecht [Mon, 19 Jul 2010 06:56:25 +0000 (08:56 +0200)]
firmware: better flash protection

13 years agofirmware: some documentation about memory maps and linkage
Ingo Albrecht [Mon, 19 Jul 2010 00:51:28 +0000 (02:51 +0200)]
firmware: some documentation about memory maps and linkage

13 years agofirmware: gave all apps a proper hello message and let them print their git revision
Ingo Albrecht [Fri, 16 Jul 2010 00:12:30 +0000 (02:12 +0200)]
firmware: gave all apps a proper hello message and let them print their git revision

13 years agofirmware: fixed linker script title
Ingo Albrecht [Fri, 16 Jul 2010 00:11:40 +0000 (02:11 +0200)]
firmware: fixed linker script title

13 years agoosmoload: better message
Ingo Albrecht [Thu, 15 Jul 2010 23:43:48 +0000 (01:43 +0200)]
osmoload: better message

13 years agoosmocon: new debug option, allows selective dumping of rx and/or tx.
Ingo Albrecht [Thu, 15 Jul 2010 23:43:06 +0000 (01:43 +0200)]
osmocon: new debug option, allows selective dumping of rx and/or tx.

13 years agofirmware: new highram linkage
Ingo Albrecht [Thu, 15 Jul 2010 23:04:20 +0000 (01:04 +0200)]
firmware: new highram linkage

13 years agofirmware: fixed linkage of ctors and dtors for ram images
Ingo Albrecht [Thu, 15 Jul 2010 23:03:53 +0000 (01:03 +0200)]
firmware: fixed linkage of ctors and dtors for ram images

13 years agofirmware: fixed linkage of ctors and dtors for flash images
Ingo Albrecht [Thu, 15 Jul 2010 22:34:07 +0000 (00:34 +0200)]
firmware: fixed linkage of ctors and dtors for flash images

13 years agofirmware: untabify linker scripts.
Ingo Albrecht [Thu, 15 Jul 2010 22:30:13 +0000 (00:30 +0200)]
firmware: untabify linker scripts.

13 years agofirmware: added missing init calls
Ingo Albrecht [Thu, 15 Jul 2010 21:56:41 +0000 (23:56 +0200)]
firmware: added missing init calls

13 years agofirmware: fixed ctor linkage
Ingo Albrecht [Thu, 15 Jul 2010 18:33:37 +0000 (20:33 +0200)]
firmware: fixed ctor linkage

13 years agofirmware: board init with a ctor does not seem a good idea to me because i need binar...
Ingo Albrecht [Wed, 14 Jul 2010 06:04:59 +0000 (08:04 +0200)]
firmware: board init with a ctor does not seem a good idea to me because i need binaries without board init

13 years agofirmware: Fixed binary dependencies.
Ingo Albrecht [Wed, 14 Jul 2010 03:03:27 +0000 (05:03 +0200)]
firmware: Fixed binary dependencies.

13 years agofirmware: fixed map file builds
Ingo Albrecht [Wed, 14 Jul 2010 00:01:38 +0000 (02:01 +0200)]
firmware: fixed map file builds

13 years agofirmware: removed obsolete comment
Ingo Albrecht [Fri, 23 Apr 2010 19:51:52 +0000 (21:51 +0200)]
firmware: removed obsolete comment

13 years agofirmware: warning fixes
Ingo Albrecht [Fri, 23 Apr 2010 19:47:25 +0000 (21:47 +0200)]
firmware: warning fixes

13 years agoloader: commented startup behaviour
Ingo Albrecht [Sun, 18 Apr 2010 07:55:36 +0000 (09:55 +0200)]
loader: commented startup behaviour

13 years agofirmware: removed flash safety hack
Ingo Albrecht [Sun, 18 Apr 2010 07:52:37 +0000 (09:52 +0200)]
firmware: removed flash safety hack

13 years agofirmware: compile-time define for flash write support
Ingo Albrecht [Sun, 18 Apr 2010 07:51:39 +0000 (09:51 +0200)]
firmware: compile-time define for flash write support

13 years agofirmware: non-asm backlight init
Ingo Albrecht [Sun, 18 Apr 2010 07:45:44 +0000 (09:45 +0200)]
firmware: non-asm backlight init

13 years agofirmware: proper exception redirect
Ingo Albrecht [Sun, 18 Apr 2010 07:43:25 +0000 (09:43 +0200)]
firmware: proper exception redirect

13 years agofirmware: fixed and commented backlight driver
Ingo Albrecht [Sun, 18 Apr 2010 07:43:06 +0000 (09:43 +0200)]
firmware: fixed and commented backlight driver

13 years agoflash: disable all printing. needed because strings can end up in flash.
Ingo Albrecht [Sun, 18 Apr 2010 06:37:04 +0000 (08:37 +0200)]
flash: disable all printing. needed because strings can end up in flash.

13 years agoosmoload: fixed programming abort
Ingo Albrecht [Sun, 18 Apr 2010 06:36:00 +0000 (08:36 +0200)]
osmoload: fixed programming abort

13 years agofirmware: establish a ramtext section for code that must be in ram
Ingo Albrecht [Sun, 18 Apr 2010 06:29:13 +0000 (08:29 +0200)]
firmware: establish a ramtext section for code that must be in ram

13 years agofirmware: flash programming
Ingo Albrecht [Sun, 18 Apr 2010 06:10:56 +0000 (08:10 +0200)]
firmware: flash programming

13 years agoflash: verify source buffer alignment when programming. allow flashing first sector.
Ingo Albrecht [Sun, 18 Apr 2010 06:10:22 +0000 (08:10 +0200)]
flash: verify source buffer alignment when programming. allow flashing first sector.

13 years agoosmoload: flash programming
Ingo Albrecht [Sun, 18 Apr 2010 06:09:34 +0000 (08:09 +0200)]
osmoload: flash programming

13 years agofirmware: consider reserved ram in loader linkage
Ingo Albrecht [Sun, 18 Apr 2010 06:09:09 +0000 (08:09 +0200)]
firmware: consider reserved ram in loader linkage

13 years agofirmware: modularized startup code
Ingo Albrecht [Sun, 18 Apr 2010 06:08:43 +0000 (08:08 +0200)]
firmware: modularized startup code

13 years agoosmoload: allow running without firmware image
Ingo Albrecht [Sun, 18 Apr 2010 06:08:03 +0000 (08:08 +0200)]
osmoload: allow running without firmware image

13 years agofirmware: separated various pieces of interrupt handling apart
Ingo Albrecht [Sun, 11 Apr 2010 07:52:25 +0000 (09:52 +0200)]
firmware: separated various pieces of interrupt handling apart

13 years agofirmware: linker script and startup code reorg.
Ingo Albrecht [Sun, 11 Apr 2010 06:04:20 +0000 (08:04 +0200)]
firmware: linker script and startup code reorg.

13 years agoloader: flash locking commands, various flash rework
Ingo Albrecht [Sun, 11 Apr 2010 05:26:42 +0000 (07:26 +0200)]
loader: flash locking commands, various flash rework

13 years agofirmware: removed compal header strings temporarily.
Ingo Albrecht [Sun, 11 Apr 2010 05:24:13 +0000 (07:24 +0200)]
firmware: removed compal header strings temporarily.

13 years agofirmware: removed old compal_dump.
Ingo Albrecht [Sun, 11 Apr 2010 05:23:09 +0000 (07:23 +0200)]
firmware: removed old compal_dump.

13 years agofirmware: cleaned up init files.
Ingo Albrecht [Sun, 11 Apr 2010 05:22:22 +0000 (07:22 +0200)]
firmware: cleaned up init files.

13 years agofirmware: linker script for flashed app on e88.
Ingo Albrecht [Sat, 10 Apr 2010 23:38:24 +0000 (01:38 +0200)]
firmware: linker script for flashed app on e88.

13 years agoflash: fixed up header
Ingo Albrecht [Sat, 10 Apr 2010 19:14:35 +0000 (21:14 +0200)]
flash: fixed up header

13 years agoloader: new state handling for memdump, added missing crc handling to memput
Ingo Albrecht [Sat, 3 Apr 2010 21:17:54 +0000 (23:17 +0200)]
loader: new state handling for memdump, added missing crc handling to memput

13 years agoloader: incomplete crc support and query timeouts
Ingo Albrecht [Tue, 30 Mar 2010 17:47:56 +0000 (19:47 +0200)]
loader: incomplete crc support and query timeouts

13 years agoloader: removed cruft
Ingo Albrecht [Sat, 3 Apr 2010 20:47:29 +0000 (22:47 +0200)]
loader: removed cruft

13 years agofirmware: fix build with new manifest
Ingo Albrecht [Tue, 30 Mar 2010 16:31:58 +0000 (18:31 +0200)]
firmware: fix build with new manifest

13 years agoosmoload: fix some printfs.
Ingo Albrecht [Sat, 13 Mar 2010 22:41:09 +0000 (23:41 +0100)]
osmoload: fix some printfs.

13 years agoloader: reply dump mode. additional information in init reply.
Ingo Albrecht [Sat, 13 Mar 2010 21:25:47 +0000 (22:25 +0100)]
loader: reply dump mode. additional information in init reply.

13 years agoosmoload: command reorg, state machine reorg, query timeouts
Ingo Albrecht [Tue, 9 Mar 2010 04:41:50 +0000 (05:41 +0100)]
osmoload: command reorg, state machine reorg, query timeouts

13 years agoloader: re-enabled firmware entry commands
Ingo Albrecht [Tue, 9 Mar 2010 04:40:10 +0000 (05:40 +0100)]
loader: re-enabled firmware entry commands

13 years agoosmoload: Added a jump command.
Ingo Albrecht [Sun, 7 Mar 2010 18:00:31 +0000 (19:00 +0100)]
osmoload: Added a jump command.

13 years agoosmoload: Print something when loader starts. Fix handling of unknown replies.
Ingo Albrecht [Sun, 7 Mar 2010 17:04:16 +0000 (18:04 +0100)]
osmoload: Print something when loader starts. Fix handling of unknown replies.

13 years agoosmoload: memload command
Ingo Albrecht [Sun, 7 Mar 2010 15:53:37 +0000 (16:53 +0100)]
osmoload: memload command

13 years agoosmoload: memdump command
Ingo Albrecht [Sun, 7 Mar 2010 12:55:28 +0000 (13:55 +0100)]
osmoload: memdump command

13 years agoAdd a copyright message to osmoload.
Ingo Albrecht [Sun, 7 Mar 2010 09:35:24 +0000 (10:35 +0100)]
Add a copyright message to osmoload.

13 years agoLoader with memory read/write and various lifecycle operations.
Ingo Albrecht [Sun, 7 Mar 2010 08:52:28 +0000 (09:52 +0100)]
Loader with memory read/write and various lifecycle operations.

13 years ago[layer23] Several minor changes and minor fixes
Andreas.Eversberg [Tue, 20 Jul 2010 10:43:12 +0000 (10:43 +0000)]
[layer23] Several minor changes and minor fixes

13 years agogsm_7bit_decode: Handle the case of the last charachter being an escape
Holger Hans Peter Freyther [Mon, 19 Jul 2010 18:54:54 +0000 (02:54 +0800)]
gsm_7bit_decode: Handle the case of the last charachter being an escape

If i + 1 == length and it is an escape charachter we would try
to read rtext[length] which is one after the field we have allocated.

13 years agotests: Separate encoding/decoding test to verify them independly
Holger Hans Peter Freyther [Mon, 19 Jul 2010 18:46:56 +0000 (02:46 +0800)]
tests: Separate encoding/decoding test to verify them independly

Use the current test result as test data for future
regression testing. The encode function appears to
add too many zeros to the text.

13 years ago* rewrite GSM 7bit default encoding/decoding based on a lookup table as the previous...
Nico Golde [Fri, 9 Jul 2010 15:19:12 +0000 (17:19 +0200)]
* rewrite GSM 7bit default encoding/decoding based on a lookup table as the previous code produced wrong encodings for certain characters.

13 years ago[firmware] TRF6151: fix VGA gain calculation bug
Harald Welte [Mon, 19 Jul 2010 12:24:46 +0000 (14:24 +0200)]
[firmware] TRF6151: fix VGA gain calculation bug

We've had two sets of TRF6151 GAIN related #defines which were used
in an incorrect manner, resulting in a vga_gain of 60, which is
outside of the allowed gain range.

Thanks to Dieter Spaar for spotting this bug

13 years ago[layer23] Fixed "return to IDLE" after cell re-selection.
Andreas.Eversberg [Mon, 19 Jul 2010 09:37:57 +0000 (09:37 +0000)]
[layer23] Fixed "return to IDLE" after cell re-selection.

Also remove forbidden PLMN from list when choosing cell manually.

13 years ago[calypso] Rework of keypad interrupt handler.
Andreas.Eversberg [Sun, 18 Jul 2010 12:56:48 +0000 (12:56 +0000)]
[calypso] Rework of keypad interrupt handler.

The keys are correctly detected and debounced. There is no delay_ms in the
interrupt handler anymore.

When a key is pressed, the columns of the keypad are polled and debounced
via timer interrupt. If no key is pressed, the timer interrupt is ignored
again.

13 years ago[layer23] Option "no location-updating" to disabled location updating
Andreas.Eversberg [Sat, 17 Jul 2010 12:43:53 +0000 (12:43 +0000)]
[layer23] Option "no location-updating" to disabled location updating

The mobile will not transmit for location updating. All networks will be
marked as "roaming not allowed", so search process continues.

13 years ago[layer23] Fixed cell search process of automatic network selection
Andreas.Eversberg [Sat, 17 Jul 2010 11:44:11 +0000 (11:44 +0000)]
[layer23] Fixed cell search process of automatic network selection

If there is no (more) "PLMN in list", a complete search is triggered, so
all available cells are searched. Then the list of available networks is
tried for location updating (if allowed) in a defined order. If the
list is done, the process searches for all available cells again.

Note: The process will cause location updating on all networks until all
networks have rejected the mobile or if one network allowed the location
updating. To prevent this, use manual network selection, and set 'rplmn' of
test-sim, so only location updating is tried on the RPLMN.

13 years ago[layer23] After location updating, the last cell is selected without search
Andreas.Eversberg [Sat, 17 Jul 2010 09:37:58 +0000 (09:37 +0000)]
[layer23] After location updating, the last cell is selected without search

13 years ago[layer23] Fixed establishment of multiple MM connections
Andreas.Eversberg [Fri, 16 Jul 2010 18:42:13 +0000 (18:42 +0000)]
[layer23] Fixed establishment of multiple MM connections

13 years ago[layer23] Added simple network monitor. Use "monitor network 1" to enable.
Andreas.Eversberg [Fri, 16 Jul 2010 10:52:38 +0000 (10:52 +0000)]
[layer23] Added simple network monitor. Use "monitor network 1" to enable.

13 years agoMerge commit '383134b5ac0b94393cd46e2f00aeb1fd6f1a540f'
Ingo Albrecht [Thu, 15 Jul 2010 20:59:55 +0000 (22:59 +0200)]
Merge commit '383134b5ac0b94393cd46e2f00aeb1fd6f1a540f'